diff options
| author | Christian Wailes <chriswailes@google.com> | 2021-03-01 08:16:54 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-01 08:16:54 +0000 |
| commit | 6c7a166d9e074c3bbef505cd15e4a40e387bc56c (patch) | |
| tree | 69703a82376a2c7bbebf23425d7ea7fe3c2a2b8a /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | af645c3188c87faee80f5bac29df2288ec9d06b2 (diff) | |
| parent | 7f037415ea9a15d1ff6be25542cef6367ba49aea (diff) | |
[automerger skipped] Merge "Add LocalManagerRegistry inside system server." am: 76348ffadf am: 4eb5f086d4 am: 7f037415ea -s ours
am skip reason: Change-Id Ib9f14070a665ebd8c582376d7ea044d9b945b6b0 with SHA-1 bd47187f71 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607280
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ifdb9865dee2a05f241a973140f162e58b6efb8bc
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions