summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2017-08-03 19:13:48 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-08-03 19:13:48 +0000
commit371ccac2ff84a2f293020ce50c4eb3dc64a4499a (patch)
tree3e4e6162644192258907ce009249a53334b52cef /tools/aapt2/java/JavaClassGenerator_test.cpp
parent5b0976d633e75e1815322b866129440b43bc67f0 (diff)
parent959512ffd57a04101dba34c776fdaa6a904d0f7b (diff)
Merge "Remove "Couldn't pair" prompt on ACTION_PAIRING_CANCEL am: 61ad5ae921 am: 39a9832df1" into oc-mr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions