Andrew Sapperstein 4c2fe5da49 Merge "Add Settings.Global configs to high temp warning."

2017-01-24 17:34:31 +00:00

..

java

Merge "Add Settings.Global configs to high temp warning."

2017-01-24 17:34:31 +00:00

jni

Merge "Use @CriticalNative in Canvas"

2017-01-24 00:15:02 +00:00

proto/android

Add ability to dump settings as proto buf

2017-01-22 15:25:22 -08:00

res

Merge changes I5df77ae5,Ice538d09,I2451be87,I953ab6cb,Ie1b8debc

2017-01-24 17:32:32 +00:00

tests

Merge "Fix ImeSubtypeListItem#compareTo()"

2017-01-24 16:37:09 +00:00