diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-15 15:00:45 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-15 15:00:45 +0000 |
| commit | 8e80628a627083c4cad3310b74c423a74619d57d (patch) | |
| tree | ed5351307ab2bed12edc3eb2d2fdb1026d7c9210 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 603ab7f9eeddc96d6a3273eee48bc848ec6fc174 (diff) | |
| parent | 5bf19b38483bc446547b5b00c14a612587d32105 (diff) | |
Merge "[automerger skipped] Merge "Revert "Add multi-user support for AutoTileManager"" into rvc-dev am: 3616fd6330 -s ours am: 302db9a7d2 -s ours" into rvc-d1-dev-plus-aosp am: 5bf19b3848 -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: I19febdb7516b2f33c92b6845c649442493d46aae
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions