Baligh Uddin 15bbb7b731 Merge "Import translations. DO NOT MERGE" into klp-dev-plus-aosp

2013-10-15 23:25:12 +00:00

..

java

am 549a9590: am 58216c26: Camera2: return CaptureResult.STATISTICS_FACES

2013-10-15 10:18:44 -07:00

jni

am f730b759: am d6c2ccb2: Merge "core: fix arithmetic on a pointer to void"

2013-10-14 13:17:20 -07:00

res

Merge "Import translations. DO NOT MERGE" into klp-dev-plus-aosp

2013-10-15 23:25:12 +00:00

tests

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

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