Christopher Tate 46e657bdbc am 26faa0be: Merge "Enforce backup encryption in the UI, not just in effect" into lmp-mr1-dev ...

* commit '26faa0be670484b3f32b9e4b07533c3fbef540f5':
  Enforce backup encryption in the UI, not just in effect

2015-01-28 01:36:33 +00:00

..

res

Import translations. DO NOT MERGE

2014-12-02 16:47:06 -08:00

src/com/android/backupconfirm

Enforce backup encryption in the UI, not just in effect

2015-01-27 15:58:36 -08:00

Android.mk

…

AndroidManifest.xml

…