Baligh Uddin 8d14311f08 Merge "Import translations. DO NOT MERGE"

2013-09-26 02:55:02 +00:00

..

java

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

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

jni

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

2013-09-25 16:50:14 -07:00

res

Merge "Import translations. DO NOT MERGE"

2013-09-26 02:55:02 +00:00

tests

am bac2fcac: am 326f4505: Merge "Update the Connectivity Manager test suit to use InstrumentationTestCase." into klp-dev

2013-09-16 14:19:18 -07:00