tree e907e8c716cf5392c318c9dbf593b83ce4ea6389
parent 082c2014384e1ddf1b9360d3a8b1c6691e875cec
parent 31cdfb401da53bec41a020f300c8f10dd7733290
author TreeHugger Robot <treehugger-gerrit@google.com> 1530323419 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1530323419 +0000

Merge "Fix a NPE in BatteryStatsImpl"