Rachad Alao 00fb27dda8 Merge "Camera2: add metadata override" into klp-dev

2013-10-07 20:40:22 +00:00

..

java

Merge "Camera2: add metadata override" into klp-dev

2013-10-07 20:40:22 +00:00

jni

Merge "reset mShapingPaint's SkTypeface before we use it" into klp-dev

2013-10-05 00:55:52 +00:00

res

Import translations. DO NOT MERGE

2013-10-07 09:54:02 -07:00

tests

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

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