Esteban Talavera c3dfa81973 Merge "Revert "Use context's userId in ContentResolver class.""

2017-02-15 13:35:35 +00:00

..

java

Merge "Revert "Use context's userId in ContentResolver class.""

2017-02-15 13:35:35 +00:00

jni

Merge "Zygote: Reset niceness if lazy preloading is enabled."

2017-02-15 10:15:16 +00:00

proto/android

Add a new setting to store the network recommendation app.

2017-02-09 08:43:19 -08:00

res

Merge "Remove color attribute from MaskableIconDrawable foreground/background tag Test: manual test"

2017-02-15 09:33:11 +00:00

tests

Merge "Revert "Use context's userId in ContentResolver class.""

2017-02-15 13:35:35 +00:00