diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-10-14 23:19:20 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-10-14 23:19:20 +0000 |
| commit | c87b5ceb22257ff435e8f91993fd7106d407804c (patch) | |
| tree | 42f1de41b8354cbb57cf178bf02807db503b9399 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | df0be7a9dced4113cc01e5acb1f7cecc5a49bad3 (diff) | |
| parent | 80de4b8d1c1866b082f4f8ce3337c7039ea19ba8 (diff) | |
[automerger skipped] Merge "Disallow overlays for ResolverActivity" into qt-dev am: f3661fc780 am: d4be365335 -s ours am: e3d406ab9a -s ours am: 6071b11999 -s ours am: 63c010460d -s ours am: 80de4b8d1c -s ours
am skip reason: skipped by user joshtrask
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15960137
Change-Id: I1e01ea72ee193777f9cba5644e62babaaaba7979
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions