| commit | 5b5c7f9917776b0ee4554320a265b3c5aa464596 | [log] [tgz] |
|---|---|---|
| author | Christopher Tate <ctate@google.com> | Fri Oct 14 10:35:40 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 14 10:35:40 2011 -0700 |
| tree | 6af1e11c0fdf6c5b8c78257eced55a774e193e66 | |
| parent | 278c39b65d585910ef57b00a208af269ad92f675 [diff] | |
| parent | ce0b8661b7d18241e232d70816261436bb0acf57 [diff] |
am 8f4e49a8: (-s ours) Merge "DO NOT MERGE - Require device encryption password for adb backup/restore" into ics-mr0 * commit '8f4e49a8fe4f568b2be090768f3297655ecd6d34': DO NOT MERGE - Require device encryption password for adb backup/restore