| commit | 46e657bdbc4323fcab14882f87ece86bc8838892 | [log] [tgz] |
|---|---|---|
| author | Christopher Tate <ctate@google.com> | Wed Jan 28 01:36:33 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 28 01:36:33 2015 +0000 |
| tree | d36cc54c759bba63eb0ec0d4fdd125ad8ffbcd0f | |
| parent | 0c607b97f068ca486036a501052572e9207c0926 [diff] | |
| parent | 26faa0be670484b3f32b9e4b07533c3fbef540f5 [diff] |
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