tree 710fef6c58bd64867dae0d56620dffede44d91b5
parent 829c0b8d9e7ac32141349117ba4364a2f63b22d8
parent bffa4ca9ad2702d51f5b391b7a05be0c7c691e4e
author Christopher Tate <ctate@google.com> 1325893574 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1325893574 -0800

Merge "Tell the user to unlock/confirm backup & restore operations"