| commit | c3323f043d78c8822b209f673c72b293ba69a630 | [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 | ddaf982081237da8a41344bef33e0bfe0508bd89 | |
| parent | 761a915390bee482e465a86563c57ea023c9570c [diff] | |
| parent | d2085a2aaab56262af52b4165ea3ecf236e3b5b9 [diff] |
[automerger skipped] Merge "Add the systemserver_fragment to media SDK." am: 12e479b70e am: 14bf8b2eb4 am: a59c1f28c7 am: 4612219708 am: d2085a2aaa -s ours am skip reason: Merged-In I2cca8b206451858e636c6bd04617cf3933f702c6 with SHA-1 dfaac07109 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1853173 Change-Id: I952507fbbc3beaea2a799daa39c8d5b1d75037be