Zhijun He fd128ff0d6 am b208861e: am aea8ec1a: Merge "Camera2: Fix Camera integration test deadlock" into klp-dev ...

* commit 'b208861ef74442ff888e1aaed61b95077364d685':
  Camera2: Fix Camera integration test deadlock

2013-09-26 10:12:09 -07:00

..

java/android

am 607ea331: am 812b6426: Merge "Fix caption rendering" into klp-dev

2013-09-25 15:26:57 -07:00

jni

Fix hang

2013-09-25 13:45:41 -07:00

mca

fix-up dependencies to gl headers

2013-08-08 21:09:16 -07:00

tests

Camera2: Fix Camera integration test deadlock

2013-09-25 19:33:31 -07:00