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 | e8fea59d6e79087c05bf3479212ec9f55d316504 (patch) | |
| tree | 750b6652974fb0d2a3e438a7b7407c5b8c63bc99 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 84b50e6a10de2be43069355446cf320542cfa48f (diff) | |
| parent | 276f6cbb7020e7c5bdf68e7c4f97fc825d034811 (diff) | |
Merge changes from topic "am-81126cf1-3777-4130-82b2-fbb9b5f9bcf8" into cw-f-dev
* changes:
[automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." am: 95a3e91846 am: 94e1a09bc6 am: 84756be0be
[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