summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2017-08-03 23:42:57 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-08-03 23:42:57 +0000
commit98f8cdac41dea6ba9e4291a40e5e1f3fb8e8d829 (patch)
treeeca99967e1e8747d65add8abc76ea694002c3f85 /tools/aapt2/java/JavaClassGenerator.cpp
parentd76830053da40b28c51b9700d2ae7f0100867dbe (diff)
parentc1183bf2e73ebe450ad98c3ab4e43ba0cfb0a0d9 (diff)
Merge "Ignore isolated uid's process state in BatteryStats tracking" into oc-dr1-dev am: 5a800cf069 am: 6aaaa2bbb0
am: c1183bf2e7 Change-Id: I0a0df13efa74f3277bf907dcc76ccda3d2ead275
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions