summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2018-09-06 00:34:33 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-09-06 00:34:33 +0000
commit2c148c58a632a7f4828e4bbdc547b593b746f937 (patch)
treef4e92e2b2a896d875719baa75d24251d46653d1e /tools/aapt2/java/JavaClassGenerator_test.cpp
parent8aac09b0c6765eabd95c1afaaeed25ef4f0fd4ae (diff)
parentdda83671f3dad949f3e32c3a833679fd4f72caa4 (diff)
Merge "[automerger skipped] [automerger] RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions. am: 8da6786608 am: 7d153c56c6 am: eff2a46342 am: ee4a2aee83 skipped: 879ecd17ab am: 47a4d99c0c am: 15682d0bd4 am: 4c0878bf74 -s ours am: 02fff3e2eb" into pi-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions