diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-04-22 17:32:53 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-04-22 17:32:53 +0000 |
| commit | 979c802a5990ffde09c61369e5b5452cb7728406 (patch) | |
| tree | e175ed2a1e19721cb2d820a982a871913623feb7 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 0b2a8cda6cc11952a151355fbd758d0ba701e3b6 (diff) | |
| parent | 203b084ba62ba3f9d8730042473c723bf11145e4 (diff) | |
[automerger skipped] Merge "DO NOT MERGE: Move CurrentUserContextTracker to SystemUIModule" into rvc-dev am: 13fb1df163 am: 64bc69501d am: aaf0b5f743 am: 203b084ba6 -s ours
am skip reason: subject contains skip directive
Change-Id: I4a178e2fead2eece19842388c4415ad5d5f33ce4
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions