tree d21b2d2ff4e057992ca31722d374697cf64d29e8
parent c041aced5acb4194bc64ec75d20842519a6801c8
parent 36ba8b1b4c0822036b4652d3e134979fae89c54d
author Adam Lesinski <adamlesinski@google.com> 1436906861 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436906861 +0000

am 36ba8b1b: am ba7e39d5: am 92a3914f: Merge "BatteryStats: Remove uid_cputime Slog.wtf for high cpu times" into mnc-dev

* commit '36ba8b1b4c0822036b4652d3e134979fae89c54d':
  BatteryStats: Remove uid_cputime Slog.wtf for high cpu times