Adam Lesinski 2494361b0b Merge "BatteryStats: Fix up semantics of SamplingTimer" into nyc-dev ...

am: 1a8a717

* commit '1a8a717ab517e7b5ace00bb4d3370e0f3a2677b2':
  BatteryStats: Fix up semantics of SamplingTimer

Change-Id: Ie2533ead98202eb9c12daa7032fe98ffd4971c56

2016-04-23 00:23:59 +00:00

..

java

Merge "BatteryStats: Fix up semantics of SamplingTimer" into nyc-dev

2016-04-23 00:20:11 +00:00

jni

Merge "Increase the max binder thread pool size for system_server." into nyc-dev

2016-04-21 00:32:47 +00:00

res

Merge "Added title and button for Data Saver\'s 1st-time dialog." into nyc-dev

2016-04-22 23:34:04 +00:00

tests

BatteryStats: Fix up semantics of SamplingTimer

2016-04-22 14:48:18 -07:00