diff options
author | Adam Lesinski <adamlesinski@google.com> | 2016-06-10 02:24:57 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-06-10 02:24:57 +0000 |
commit | 4c51943d8ebb19fbf80fb38e6925285f5d449980 (patch) | |
tree | d70437813295a528014eec674177ba306f7fa4b7 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 5185fe59588abf94478bf1043e3da0ff483aab4d (diff) | |
parent | d499d79b07a7f15df15d843242563e4282ecdd83 (diff) |
Merge \\"BatteryStats: Record fine grained battery discharge\\" into nyc-dev am: 094c40b2cc
am: d499d79b07
Change-Id: I60296dd0d584090f649188a3d7d70faea21b6265
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions