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