diff options
author | Adam Lesinski <adamlesinski@google.com> | 2015-07-09 01:42:15 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-09 01:42:15 +0000 |
commit | 1ad61b3314b1ea3a99d804ec9a89caae25636897 (patch) | |
tree | 824b4c439a44c39ed7f019bf44a90506166b59fe /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | d705f35568c85f2ae6e6ff1f4aae53c3556d6589 (diff) | |
parent | 1549adb4eaef28ef41ebd063df1e339de035e19d (diff) |
am 1549adb4: am 7fb1655a: Merge "BatteryStats: Fail gracefully on corrupt battery stats" into mnc-dev
* commit '1549adb4eaef28ef41ebd063df1e339de035e19d':
BatteryStats: Fail gracefully on corrupt battery stats
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions