Zhijun He fbf3801637 am 822ac0ba: Merge "Camera2: Implement CameraManager#getCameraCharacteristics" into klp-dev ...

* commit '822ac0bada06b2185b4d5e8304160b680a72cff2':
  Camera2: Implement CameraManager#getCameraCharacteristics

2013-09-25 17:00:05 -07:00

..

java

am 822ac0ba: Merge "Camera2: Implement CameraManager#getCameraCharacteristics" into klp-dev

2013-09-25 17:00:05 -07:00

jni

am 66a9b2d7: Merge "Fix issue #10903002: com.facebook.katana keeps itself in A Services" into klp-dev

2013-09-25 16:09:13 -07:00

res

am 4598cd65: Merge "Update toast appearance" into klp-dev

2013-09-25 16:56:07 -07:00

tests

Merge "Update the Connectivity Manager test suit to use InstrumentationTestCase." into klp-dev

2013-09-16 21:11:31 +00:00