tree d123cffd963c53480583ca53fa391627b3329536
parent 292a1564e087047dc5d7ff552d5b70da2933795d
parent 0fd6914489789cf9541f016556691d08b0b2df92
author Jim Miller <jaggies@google.com> 1436313508 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436313508 +0000

am 0fd69144: am e86f1752: Merge "Use custom theme for keyguard presentation" into mnc-dev

* commit '0fd6914489789cf9541f016556691d08b0b2df92':
  Use custom theme for keyguard presentation