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 | b908fd8d0785189c620a644f234ac10d0fbb237d (patch) | |
| tree | 9cd42bfee4870206f683ca07fe30ed9a64180c1f /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 90b8425c0b68b6297118191c7de8ed861f3c8560 (diff) | |
| parent | 50861d59c2ea756f9d02e1202e26a800594abdaa (diff) | |
Merge changes from topic "am-81126cf1-3777-4130-82b2-fbb9b5f9bcf8" into nyc-mr2-dev
* changes:
[automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." am: 95a3e91846 am: 94e1a09bc6 am: 84756be0be am: 276f6cbb70
[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