Joe LaPenna 44b970b88d Merge "Allow setting doze timeouts based on system feature" into nyc-dev am: 23c63dd ...

am: 248b40b

* commit '248b40bfacb702c2ab6804dfd7f95e7d2c1f8739':
  Allow setting doze timeouts based on system feature

2016-03-24 18:26:56 +00:00

..

java

Merge "Allow setting doze timeouts based on system feature" into nyc-dev am: 23c63dd

2016-03-24 18:26:56 +00:00

jni

Delete references to SkImageDecoder

2016-03-24 15:27:31 +00:00

res

Merge "Fixed a bug with the collapsed media template" into nyc-dev am: 45acc15

2016-03-24 16:54:57 +00:00

tests

Merge "Keyboard Shortcuts: plumb deviceId through" into nyc-dev am: 3e5bf78

2016-03-24 13:41:42 +00:00