Henrik Baard 790699db64 Merge "Doze settings example not matching real keys" ...

am: 570a13f

* commit '570a13f0cb233b4a216243025a9fed3df3c72849':
  Doze settings example not matching real keys

Change-Id: I62dade8bece244e9033a230c1f116f8caad35a6f

2016-04-20 22:51:47 +00:00

..

java

Merge "Doze settings example not matching real keys"

2016-04-20 22:51:47 +00:00

jni

Merge "Add choreographer API to the NDK."

2016-04-14 08:11:45 +00:00

res

set default journal mode to TRUNCATE, not PERSIST

2016-03-23 23:35:41 -04:00

tests

Remove support of disabling Jack.

2016-03-30 13:58:10 -07:00