summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorJoshua Schwarz <joshuaschwarz@google.com>2015-09-02 07:41:52 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-02 07:41:52 +0000
commitbade9522cf11141d3bd31ab9d56976a33d05fc64 (patch)
tree44f88cadebdeff9ee146896ed5b8bf04ed0b8544 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentc4809bcfa72f2f4eb4f03cb4b86dbb864cc01147 (diff)
parent258a7cd95e247a01d7dbb02b8858db6aa90ce621 (diff)
am 258a7cd9: Merge "Use LOCAL_MAC_ADDRESS permission in bluetoothtests." into cw-e-dev
* commit '258a7cd95e247a01d7dbb02b8858db6aa90ce621': Use LOCAL_MAC_ADDRESS permission in bluetoothtests.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions