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
This commit is contained in:
Christopher Tate 2011-10-14 10:35:40 -07:00 committed by Android Git Automerger
commit 5b5c7f9917

Diff Content Not Available