Ricky Wai e4c827662a Merge "Make "work mode on dialog" show personal challenge in unified work lock" into nyc-dev ...

am: 4ace836

* commit '4ace8366619d04d326505ad689c5d43707f2aaea':
  Make "work mode on dialog" show personal challenge in unified work lock

Change-Id: I2b6fe365bf3556d9fba5ac3c2c7580ded28dc644

2016-04-25 13:20:37 +00:00

..

java

Merge "Make "work mode on dialog" show personal challenge in unified work lock" into nyc-dev

2016-04-25 13:20:37 +00:00

jni

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

2016-04-21 00:39:06 +00:00

res

Merge "Fix unexpected truncation again." into nyc-dev

2016-04-25 03:42:38 +00:00

tests

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

2016-04-23 00:23:56 +00:00