Rachad Alao 5be2d2af80 am 0ed8c93c: am 00fb27dd: Merge "Camera2: add metadata override" into klp-dev ...

* commit '0ed8c93cffec6b4d0c1e86599365074b1b2c3f1f':
  Camera2: add metadata override

2013-10-07 13:46:05 -07:00

..

java

am 0ed8c93c: am 00fb27dd: Merge "Camera2: add metadata override" into klp-dev

2013-10-07 13:46:05 -07:00

jni

am 0d5a719d: am b088c9e0: Merge "reset mShapingPaint\'s SkTypeface before we use it" into klp-dev

2013-10-04 18:01:45 -07: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