summaryrefslogtreecommitdiffstats
path: root/libs
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2014-12-04 15:15:16 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-04 15:15:16 +0000
commitf2b934b42be772d457b3f6e16c95aad1056c502e (patch)
treef4e02c8d4195d14fc99286648638186bf40fcd5f /libs
parent9a4472bf45044082f4fa6d906530f3640761676a (diff)
parent3ea6824034ea8fbcd418af8e07606f60fd844e45 (diff)
downloadframeworks_base-f2b934b42be772d457b3f6e16c95aad1056c502e.zip
frameworks_base-f2b934b42be772d457b3f6e16c95aad1056c502e.tar.gz
frameworks_base-f2b934b42be772d457b3f6e16c95aad1056c502e.tar.bz2
am 3ea68240: Merge "Stop keyguard from spamming the log" into lmp-mr1-dev
* commit '3ea6824034ea8fbcd418af8e07606f60fd844e45': Stop keyguard from spamming the log
Diffstat (limited to 'libs')
0 files changed, 0 insertions, 0 deletions