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

automerge: 134aedd

* commit '134aedd2c9bce194a5c826fe7a9a7389edd8bcad':
  Enforce backup encryption in the UI, not just in effect

2015-01-28 01:49:56 +00:00

..

res

Import translations. DO NOT MERGE

2015-01-21 07:33:21 -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

…