diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-02 16:20:26 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-02 16:20:26 +0000 |
commit | a6a99f259ad566c32a6c6fa45803b3bc88db158d (patch) | |
tree | f820e1f96481c55bc0bcc085c1e780f760eeb35b /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | acf5e96be8a158274afefa5b6d6753da82a9e57c (diff) | |
parent | c9e079be1147a6c7cb12257c1cc61a6e746ee093 (diff) |
[automerger skipped] Merge "[DO NOT MERGE]Revert "Flip ENABLE_DYNAMIC_PERMISSIONS, attempt #6."" into rvc-dev am: 3d61c82b41 am: a88ba4ea3c am: 693bcf5a2e am: c9e079be11 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12065945
Change-Id: I32de1c8178b2718249934be9ac4c2f8d1541ed27
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions