| commit | 134aedd2c9bce194a5c826fe7a9a7389edd8bcad | [log] [tgz] |
|---|---|---|
| author | Christopher Tate <ctate@google.com> | Wed Jan 28 01:47:53 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 28 01:47:53 2015 +0000 |
| tree | 59b5d084ed0fa2fb56c5c015649d5c7ef1bb8f33 | |
| parent | ff1876d1fb8dfcaba61d3fc7de296d663a4e160e [diff] | |
| parent | 46e657bdbc4323fcab14882f87ece86bc8838892 [diff] |
am 46e657bd: am 26faa0be: Merge "Enforce backup encryption in the UI, not just in effect" into lmp-mr1-dev * commit '46e657bdbc4323fcab14882f87ece86bc8838892': Enforce backup encryption in the UI, not just in effect