| commit | 4a32dabc739508d2e724ae73381b289c6c189bc1 | [log] [tgz] |
|---|---|---|
| author | Jiakai Zhang <jiakaiz@google.com> | Tue Oct 12 13:19:16 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Oct 12 13:19:16 2021 +0000 |
| tree | 7cba056cd97cb498e6e773796ab2ecfe81547bfb | |
| parent | 4086d6aa38b2a453621022da0918b8fed33217c8 [diff] | |
| parent | 59dbf8d356c64c3e748060368371c19849905558 [diff] |
[automerger skipped] Merge "Add the systemserver_fragment to media SDK." am: 12e479b70e am: c6af5600fd am: d869638896 am: 10b7b59359 am: 59dbf8d356 -s ours am skip reason: Merged-In I2cca8b206451858e636c6bd04617cf3933f702c6 with SHA-1 381fb640c6 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1853173 Change-Id: I952507fbbc3beaea2a799daa39c8d5b1d75037be