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

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

2013-10-07 17:01:21 -07:00

..

java

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

2013-10-07 17:01:21 -07:00

jni

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

2013-10-04 18:04:57 -07:00

res

Import translations. DO NOT MERGE

2013-10-07 10:41:46 -07:00

tests

add a test for BackupData helpers.

2013-09-25 19:33:21 +00:00