summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorAtanas Kirilov <akirilov@google.com>2018-09-28 23:21:47 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-09-28 23:21:47 +0000
commit9f6ffb734fee7de508b565450ccc588fe54740e3 (patch)
treec47c6b926e6085a4a0f1d4ec449d4fa3f8947f7e /tools/aapt2/java/JavaClassGenerator.cpp
parent79c6a599fec0cacb778ef29cf91cf769c89a0c64 (diff)
parent94e1a09bc6c0b83550bf7d8bc7d82cee77941efb (diff)
Merge changes from topic "am-81126cf1-3777-4130-82b2-fbb9b5f9bcf8" into nyc-dr1-dev
* changes: [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