summaryrefslogtreecommitdiffstats
path: root/packages/BackupRestoreConfirmation
diff options
context:
space:
mode:
authorCraig Mautner <cmautner@google.com>2014-12-02 21:13:58 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-12-02 21:14:00 +0000
commit41ec0400056daa97d40bd4a8225b7d4f0d665598 (patch)
tree16a13e26881409ffc5878719796ff1f4b9a12d75 /packages/BackupRestoreConfirmation
parent4e779ecd56faad5901854e030f593c5d4ad3dee8 (diff)
parentca0a124da0aaa3383b7648e3114a7be277800c3a (diff)
downloadframeworks_base-41ec0400056daa97d40bd4a8225b7d4f0d665598.zip
frameworks_base-41ec0400056daa97d40bd4a8225b7d4f0d665598.tar.gz
frameworks_base-41ec0400056daa97d40bd4a8225b7d4f0d665598.tar.bz2
Merge "Dismiss insecure keyguards if FLAG_SHOW_WHEN_LOCKED" into lmp-mr1-dev
Diffstat (limited to 'packages/BackupRestoreConfirmation')
0 files changed, 0 insertions, 0 deletions