summaryrefslogtreecommitdiffstats
path: root/graphics/java/android
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2012-10-11 18:21:12 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-10-11 18:21:13 -0700
commitfdb6be8b1f76caf0f2ba64fb68d5d0b8e33a7a54 (patch)
tree0f154d6df33c716ebc002b665c4246b9c32915ed /graphics/java/android
parent87afd6eb4b7e08da0c10bece82ed594c5babc404 (diff)
parent43c5b5568539dd1726fff75f7bee7eb481f87844 (diff)
downloadframeworks_base-fdb6be8b1f76caf0f2ba64fb68d5d0b8e33a7a54.zip
frameworks_base-fdb6be8b1f76caf0f2ba64fb68d5d0b8e33a7a54.tar.gz
frameworks_base-fdb6be8b1f76caf0f2ba64fb68d5d0b8e33a7a54.tar.bz2
Merge "Always show emergency button on selector view screen in keyguard." into jb-mr1-dev
Diffstat (limited to 'graphics/java/android')
0 files changed, 0 insertions, 0 deletions