| commit | 5e0cd7768e11a10cada341b60f96998295de2756 | [log] [tgz] |
|---|---|---|
| author | Christopher Tate <ctate@google.com> | Wed Jan 28 01:49:56 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jan 28 01:49:56 2015 +0000 |
| tree | af31e7765b9c1bd1bd877f3ce46ae843b631071d | |
| parent | 715437763c56a8a23d9ce711b011bdddc90e7b61 [diff] | |
| parent | 134aedd2c9bce194a5c826fe7a9a7389edd8bcad [diff] |
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