diff options
author | Jason Monk <jmonk@google.com> | 2014-12-10 21:11:30 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-10 21:11:30 +0000 |
commit | 65c08ec82a11eeb2ea8b048935ddafc694fc0236 (patch) | |
tree | 297a00f5b153e9c38af67bf35482e82ee9ec73d4 /packages/BackupRestoreConfirmation/res/values-ca/strings.xml | |
parent | ed211b940b24231d02c4e6e2757ee02ff1b9ea79 (diff) | |
parent | 4ef9edeb67a1aa25b4ec57b9951b8dc4a06c3691 (diff) | |
download | frameworks_base-65c08ec82a11eeb2ea8b048935ddafc694fc0236.zip frameworks_base-65c08ec82a11eeb2ea8b048935ddafc694fc0236.tar.gz frameworks_base-65c08ec82a11eeb2ea8b048935ddafc694fc0236.tar.bz2 |
am 4ef9edeb: Merge "Handle policy change while keyguard disabled" into lmp-mr1-dev
* commit '4ef9edeb67a1aa25b4ec57b9951b8dc4a06c3691':
Handle policy change while keyguard disabled
Diffstat (limited to 'packages/BackupRestoreConfirmation/res/values-ca/strings.xml')
0 files changed, 0 insertions, 0 deletions