Ruben Brunk 92d7ed1d59 am f267dd1d: Merge "Fix CameraService error flag when running HAL1 with API2." into klp-dev ...

* commit 'f267dd1d794237229fe71f37d54896ce54c9750d':
  Fix CameraService error flag when running HAL1 with API2.

2013-09-04 18:28:05 -07:00

..

java

am f267dd1d: Merge "Fix CameraService error flag when running HAL1 with API2." into klp-dev

2013-09-04 18:28:05 -07:00

jni

am 04c58e9e: Merge "Java API for AudioTrack timestamps" into klp-dev

2013-09-04 15:33:20 -07:00

res

am 49ee555f: Merge "Transition API changes from API council recommendations" into klp-dev

2013-09-04 16:49:39 -07:00

tests

Merge "Use core-tests-support instead of core-tests" into klp-dev

2013-08-30 23:21:27 +00:00