summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2017-07-06 18:48:03 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-07-06 18:48:03 +0000
commit644c0a26904e96d437d7786e649b285f53ab1277 (patch)
tree960a3f3cf0b2530bd56105b7e839de99324b33ff /tools/aapt2/java/JavaClassGenerator_test.cpp
parent6e6b4f713f3b3404e8f7a812266d4e4b4888a502 (diff)
parent0d6e0cb77e806feb704d88809aed6d8794c54290 (diff)
Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" into oc-dr1-dev am: f259a1975b" into oc-dr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions