diff options
author | Jim Miller <jaggies@google.com> | 2012-09-16 11:57:23 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-16 11:57:23 -0700 |
commit | b45965f519d41f138f0d0edfb587e4861e2199f4 (patch) | |
tree | 5be9bcd081c4a002e81093d29fa04a023696764d /nfc-extras | |
parent | 7db4eec5951aac8dc9428430d7928f96062fa8d4 (diff) | |
parent | 08b2b6bfe2550b65c68ad7b4bef8283f1ff17561 (diff) | |
download | frameworks_base-b45965f519d41f138f0d0edfb587e4861e2199f4.zip frameworks_base-b45965f519d41f138f0d0edfb587e4861e2199f4.tar.gz frameworks_base-b45965f519d41f138f0d0edfb587e4861e2199f4.tar.bz2 |
Merge "Fix keyguard timeout dialog messages" into jb-mr1-dev
Diffstat (limited to 'nfc-extras')
0 files changed, 0 insertions, 0 deletions