Amith Yamasani 632b7dc884 am 6db7f39b: am 1eae6109: am 1b5a2e63: Merge "Don\'t backup/restore ringer mode" into klp-dev ...

* commit '6db7f39ba573fd087c79da9585801c3f277ac8fc':
  Don't backup/restore ringer mode

2013-10-07 17:09:04 -07:00

..

java

am 6db7f39b: am 1eae6109: am 1b5a2e63: Merge "Don\'t backup/restore ringer mode" into klp-dev

2013-10-07 17:09:04 -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

…