tree e7c18342046ac266323013d78fcc8143a4903652
parent fb166de438203aeefdb687f54a5ddd9ca83b9ddf
parent 5a5a7fefef8b19aa06a8a32f6dab261947497ec7
author Narayan Kamath <narayan@google.com> 1518002305 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1518002305 +0000

Merge "BatteryStats : Remove unused upTime parameter."