diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-15 15:12:50 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-15 15:12:50 +0000 |
| commit | 8365891219f7da18fd5718bc1ab03ddd485bab4a (patch) | |
| tree | 5a8d8c8a1e5704d645b57155a8888937a2b2482c /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 750c9f2827a6ca493d65390598feb1c2e42b139d (diff) | |
| parent | ac536b9df222f2dc920bfd4dd1f4ed38cebff76c (diff) | |
Merge "[automerger skipped] Merge "Revert "Add multi-user support for AutoTileManager"" into rvc-dev am: 3616fd6330 am: d2862c2335 -s ours am: ed87d2e4e7 -s ours" into rvc-qpr-dev-plus-aosp am: ac536b9df2 -s ours
am skip reason: Change-Id I518334cca0a0960e0b3b74b43ac9fce4610c7bd0 with SHA-1 31a266d5a3 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11854549
Change-Id: I63a8f5f4291ee9c6fc779daff01a0873d67a91a4
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions