Jason Monk 9f37fa92e0 Merge "Add test API for if the device supports QS" into oc-dev am: be436bdefe ...

am: b3963766c6

Change-Id: I9601140fb9d24cec74d3c028240acaa1b7d0113d

2017-04-03 19:27:26 +00:00

..

java

Merge "Add test API for if the device supports QS" into oc-dev am: be436bdefe

2017-04-03 19:27:26 +00:00

jni

Merge "Camera: add batching support to HAL1 recording path" into oc-dev am: e1df48d3a0

2017-04-03 17:34:03 +00:00

proto/android

…

res

Merge "Add test API for if the device supports QS" into oc-dev am: be436bdefe

2017-04-03 19:27:26 +00:00

tests

Merge "Change test type from InstrumentationTest to AndroidJUnitTest"

2017-04-01 01:22:46 +00:00