summaryrefslogtreecommitdiffstats
path: root/services/java/com/android/server/SystemServer.java
diff options
context:
space:
mode:
authorJorim Jaggi <jjaggi@google.com>2015-08-11 01:31:56 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-08-11 01:31:56 +0000
commitf8359cfb93e349771388709b160ae1b9d3f880b3 (patch)
tree77c8d48860c8a4d039941f74544b54ac47d5d412 /services/java/com/android/server/SystemServer.java
parentb2b020922fb51b88d34a6478209fc232702de318 (diff)
parentb29814c4ccdec4c1fbaaa3a6d633b104bee06184 (diff)
downloadframeworks_base-f8359cfb93e349771388709b160ae1b9d3f880b3.zip
frameworks_base-f8359cfb93e349771388709b160ae1b9d3f880b3.tar.gz
frameworks_base-f8359cfb93e349771388709b160ae1b9d3f880b3.tar.bz2
Merge "Don't show fingerprint cancellation messages in keyguard" into mnc-dev
Diffstat (limited to 'services/java/com/android/server/SystemServer.java')
0 files changed, 0 insertions, 0 deletions