summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2016-05-26 23:27:20 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-05-26 23:27:21 +0000
commitf322db1e0db11c670c34bea6014c3d43f030941b (patch)
tree356c91ed5f447b3b7ebe32ccca4e26d7729a086f /tools/aapt2/java/JavaClassGenerator_test.cpp
parente8491bf8c57c36985a73a60cf3f22f30715ab6ed (diff)
parentd099eddf8da93d05a914aed87e64daa0d966e8d3 (diff)
Merge "Merge "Change how TelephonyManager handles subscriptions." into nyc-dev am: 4c04097fdb am: 531cd8724c" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions