diff options
| author | Atanas Kirilov <akirilov@google.com> | 2018-09-28 23:21:47 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-09-28 23:21:47 +0000 |
| commit | 29a7dc21323912498cb7f375bb3e710a039ebed3 (patch) | |
| tree | 0c6f3c77f8be1796d7ccb71d7293e226c6ab1adc /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 446837c8744640a422bc4bf94a95b283762fe768 (diff) | |
| parent | 84756be0beaace90cf87f65a34b679d2bbf9d1f5 (diff) | |
Merge changes from topic "am-81126cf1-3777-4130-82b2-fbb9b5f9bcf8" into nyc-mr1-dev
* changes:
[automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." am: 95a3e91846 am: 94e1a09bc6
[automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." am: 95a3e91846
RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package."
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions