diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-15 15:13:38 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-15 15:13:38 +0000 |
| commit | 1462ddd26ff5a11090df5c763190dbb6e22bac88 (patch) | |
| tree | 5a8d8c8a1e5704d645b57155a8888937a2b2482c /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 3d4238fe0b9a0bca1170f525ca327f4a4b8d975c (diff) | |
| parent | 8e80628a627083c4cad3310b74c423a74619d57d (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: 8e80628a62 -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: Id4dd42d0e93d24e2691b529e7da0bebcf9a41469
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions