tree 59b5d084ed0fa2fb56c5c015649d5c7ef1bb8f33
parent ff1876d1fb8dfcaba61d3fc7de296d663a4e160e
parent 46e657bdbc4323fcab14882f87ece86bc8838892
author Christopher Tate <ctate@google.com> 1422409673 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422409673 +0000

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