tree 37ce76cdcf36d28a599f5c1f022ce72ba8418bf7
parent b42cb352a350bac198470f65125aa151ecacff13
parent 062e66cb15c856f840ea0806bcf90848c35baa4f
author Adam Lesinski <adamlesinski@google.com> 1436914820 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1436914824 +0000

Merge "BatteryStats: Fix units in wakelock distribution calculation" into mnc-dev