summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorPavel Zhamaitsiak <pavelz@google.com>2015-03-30 16:21:17 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-03-30 16:21:17 +0000
commit271c9edc3039cbcabd2b7cadeead8c96bb785d8f (patch)
tree362ec4f614c05df1221da075c144444c29592776 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent998fb1975f37881ee07a9f74d723bd742ac64363 (diff)
parent5fd843b33383266cfe5f79f7ba4c5134c104cda0 (diff)
Merge "WiFi Calling: Show different operator name string in Data usage dialog." into lmp-mr1-wfc-dev
automerge: 5fd843b * commit '5fd843b33383266cfe5f79f7ba4c5134c104cda0': WiFi Calling: Show different operator name string in Data usage dialog.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions