tree dfa4e217429bab25bad1d3720c919ae0365f9986
parent 000053859290d322625dfcbdb0467fc34d5e55f4
parent b9c1acfb0b4a41ffb5a4d9c38ef298c3a1eb9599
author Christopher Tate <ctate@google.com> 1318613593 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1318613593 -0700

Merge "DO NOT MERGE - Require device encryption password for adb backup/restore" into ics-mr0