diff options
author | Adam Lesinski <adamlesinski@google.com> | 2016-06-10 02:21:50 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-06-10 02:21:50 +0000 |
commit | ae903e100f567f934e2b1c9522960f4464dcbeb2 (patch) | |
tree | 3dd1a5dfe3aca3de317b176488ece477d45fb218 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 21b6b2a2d195dedca9ce51378441e5a0780144aa (diff) | |
parent | 094c40b2cc70fefb29771fb90d7ea7437905b3a5 (diff) |
Merge \"BatteryStats: Record fine grained battery discharge\" into nyc-dev
am: 094c40b2cc
Change-Id: Ia25345a4ae48ad181edb58fd4b5940145ce19107
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions