summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2017-01-03 11:17:22 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-01-03 11:17:25 +0000
commit03b1d5208883dca4c0ac906d9ec6ac1537ef3e00 (patch)
tree7774f4bf1a0986b05bef965ce62ab1cc2f9c1dfb /tools/aapt2/java/JavaClassGenerator_test.cpp
parent43dc6e795cd7976424baebc3c9d387ecbc6131ea (diff)
parentbf3e5249763ab8ae11f687a3f1e532fea5293375 (diff)
Merge "In permission review mode, always request user's consent to toggle BT. am: d2d32b1f32 am: 0368be4523" into nyc-mr2-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions