Adam Lesinski 8fc495ed94 Merge "Fix CTS breakage in Context and Override configurations"

2016-11-29 20:07:38 +00:00

..

java

Merge "Fix CTS breakage in Context and Override configurations"

2016-11-29 20:07:38 +00:00

jni

Merge "Introduce Bitmap.Config.Hardware with @hide annotation"

2016-11-23 23:43:45 +00:00

res

Import translations. DO NOT MERGE

2016-11-28 15:27:55 -08:00

tests

Merge "Revert "Introduce RoughtimeClient""

2016-11-28 17:54:37 +00:00