Alan Viverette 77a4d4340f Merge "Clean up ContextThemeWrapper"

2015-08-25 18:58:43 +00:00

..

java

Merge "Clean up ContextThemeWrapper"

2015-08-25 18:58:43 +00:00

jni

Merge "AudioTrack: error reporting for getTimestamp()"

2015-08-24 17:06:32 +00:00

res

am e3e93853: am 9bdcde8a: am 49eb98e7: add permissions strings that have to be altered from framework originals for use in Wear BUG: 23223527

2015-08-25 05:36:09 +00:00

tests

Merge "[Backup] Special handling for sharedpref files in backup config"

2015-08-25 18:06:15 +00:00