summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2019-08-28 02:04:12 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-08-28 02:04:12 +0000
commit5d177d560c270f2eb0d142bb4e56b2e82f4aba67 (patch)
treee499888835188f1821e2f8c7770a4491d1356436 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent3a142c0a3291f71c23e0c4acebe0d1fc4f00aa45 (diff)
parented87acb4228e141ea629d1fa7ebed1fc8bd6f207 (diff)
Merge "[automerger skipped] Merge "Use framework_native_aidl for AIDL files in frameworks/native/aidl" am: 46993bb4f5 am: f4b1cdfe5d am: 02ce7858e5 am: cb6b9f12c7 am: c7b53f7540 -s ours am skip reason: change_id I8acb39522541f1e06d1a4b69b7a53b328c202eff with SHA1 82f94056ce is in history"
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions