Alex Ray bb478e6da0 am 783d3c1e: am 69c66f42: Merge "camera2: describe non-full hw level optional tag entries" into klp-dev ...

* commit '783d3c1ed1989e820437fec4224079d8c860ad36':
  camera2: describe non-full hw level optional tag entries

2013-10-07 16:31:24 -07:00

..

java

am 783d3c1e: am 69c66f42: Merge "camera2: describe non-full hw level optional tag entries" into klp-dev

2013-10-07 16:31:24 -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