tree 1191f3e806d7342146aae9cf25e900fd6ded3ca9
parent 963471f08f2bc85c3dfc47ea15f1f028b9f2c3b6
parent e86f175229f5cf7b6149ecc19cf8de60be722293
author Jim Miller <jaggies@google.com> 1436312261 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436312261 +0000

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

* commit 'e86f175229f5cf7b6149ecc19cf8de60be722293':
  Use custom theme for keyguard presentation