diff options
| author | Christopher Tate <ctate@google.com> | 2015-01-28 01:49:56 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-01-28 01:49:56 +0000 |
| commit | 5e0cd7768e11a10cada341b60f96998295de2756 (patch) | |
| tree | af31e7765b9c1bd1bd877f3ce46ae843b631071d /policy | |
| parent | 715437763c56a8a23d9ce711b011bdddc90e7b61 (diff) | |
| parent | 134aedd2c9bce194a5c826fe7a9a7389edd8bcad (diff) | |
| download | frameworks_base-5e0cd7768e11a10cada341b60f96998295de2756.zip frameworks_base-5e0cd7768e11a10cada341b60f96998295de2756.tar.gz frameworks_base-5e0cd7768e11a10cada341b60f96998295de2756.tar.bz2 | |
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
Diffstat (limited to 'policy')
0 files changed, 0 insertions, 0 deletions