Zhijun He da7a00a208 am e32e311a: am c37a5ab5: Merge "Camera2: fix Face class java doc build break" into klp-dev ...

* commit 'e32e311a1159d03cda7791880bb5a32ca1d5e37f':
  Camera2: fix Face class java doc build break

2013-10-07 15:12:19 -07:00

..

java

am e32e311a: am c37a5ab5: Merge "Camera2: fix Face class java doc build break" into klp-dev

2013-10-07 15:12:19 -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