Derek Sollenberger 07945ed207 Merge "Revert "Use colorFilters when rendering to an sRGB bitmap.""

2017-08-02 21:59:28 +00:00

..

java

Merge "Merge "Make InputFilter.AllCaps constructor reject null locales" into oc-mr1-dev am: 6e8e322ea1 am: 6359944a19"

2017-08-02 21:35:00 +00:00

jni

Merge "Revert "Use colorFilters when rendering to an sRGB bitmap.""

2017-08-02 21:59:28 +00:00

proto/android

Merge "Settings: Remove SamplingProfiler vestiges"

2017-07-25 22:43:18 +00:00

res

Merge "NetworkRecommendationProviders require the location permission."

2017-08-02 21:33:35 +00:00

tests

Merge "View: fix setTransientState" into oc-mr1-dev am: 8eb3a3979f

2017-08-02 17:34:16 +00:00