summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorEsteban Talavera <etalavera@google.com>2015-08-27 10:30:14 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-27 10:30:14 +0000
commit665ddafa511d46ec7f2679180638c7af4c42ef46 (patch)
tree715d547d2502de8d04de0ec12233b3183ce62c99 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentaadc3487e41e2ecdd1c1157a5f17bcdd83ed4897 (diff)
parentacbb1a96348f3abd4520773c27ebebc5a6a40c30 (diff)
am acbb1a96: (-s ours) am 5d467ac5: Merge "Remove uids with empty history from NetworkStats uid enumeration" into mnc-dev
* commit 'acbb1a96348f3abd4520773c27ebebc5a6a40c30':
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions