Alan Viverette e4b0a9a940 am 607ea331: am 812b6426: Merge "Fix caption rendering" into klp-dev ...

* commit '607ea331ebe6f133a7e95a0e37d4c00085646708':
  Fix caption rendering

2013-09-25 15:26:57 -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

…

tests

camera2: Rename CameraProperties to CameraCharacteristics

2013-09-21 21:01:32 -07:00