Nick Kralevich 83c282af83 Merge "Don't set sehash when calling restoreconRecursive" into qt-dev ...

am: 4ef3e8a309

Change-Id: I99389ec57025f106e0eee52b7ceee78d17b8c864

2019-04-05 13:32:36 -07:00

..

java

Merge "Don't set sehash when calling restoreconRecursive" into qt-dev

2019-04-05 13:32:36 -07:00

jni

Merge "EGLAttrib requires special handling in JNI" into qt-dev

2019-04-05 10:50:01 -07:00

proto

Reserve display white balance metric

2019-04-03 17:53:01 -04:00

res

Merge "Adding a level of indirection. Dimens value should live in the framework/base and not the overlay." into qt-dev

2019-04-05 12:09:35 -07:00

tests

Merge "Merge "Flag to configure model parameters" into qt-dev am: 3b74731f4e" into qt-dev-plus-aosp

2019-04-05 16:58:09 +00:00

xsd

Merge "Add Vts test for xsd_config"

2019-04-05 06:50:43 +00:00