summaryrefslogtreecommitdiffstats
path: root/nfc-extras
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2012-09-16 11:57:23 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-09-16 11:57:23 -0700
commitb45965f519d41f138f0d0edfb587e4861e2199f4 (patch)
tree5be9bcd081c4a002e81093d29fa04a023696764d /nfc-extras
parent7db4eec5951aac8dc9428430d7928f96062fa8d4 (diff)
parent08b2b6bfe2550b65c68ad7b4bef8283f1ff17561 (diff)
downloadframeworks_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