OSDN Git Service

am 26faa0be: Merge "Enforce backup encryption in the UI, not just in effect" into...
authorChristopher Tate <ctate@google.com>
Wed, 28 Jan 2015 01:36:45 +0000 (01:36 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 28 Jan 2015 01:36:45 +0000 (01:36 +0000)
* commit '26faa0be670484b3f32b9e4b07533c3fbef540f5':
  Enforce backup encryption in the UI, not just in effect


Trivial merge