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:18:33 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-01-03 11:18:36 +0000
commit873c2054c96c58f1ff60d97589b8a2bdc07f9ffd (patch)
tree7774f4bf1a0986b05bef965ce62ab1cc2f9c1dfb /tools/aapt2/java/JavaClassGenerator_test.cpp
parente337729543fd1bae9dbd0e82dfbce578a12c4e52 (diff)
parent171af67a69c630830d7c0df045bf3490eaf24ae0 (diff)
Merge "Merge "In permission review mode, always request user's consent to toggle BT." into cw-f-dev am: 34624a5d83 am: 2dd60e81ad" into nyc-mr2-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions