Courtney Goeltzenleuchter 1b53374b88 Merge "EGLAttrib requires special handling in JNI" into qt-dev ...

am: 44e30f9a0d

Change-Id: I34f19c30a6a06763e4f1852ac4f11cfcd854410f

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

..

java

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

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 "Update icon for Calendar permission." into qt-dev

2019-04-05 07:48:12 -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