OSDN Git Service

am c041d01e: am 3c06c3f9: (-s ours) am e86f1752: Merge "Use custom theme for keyguard...
authorJim Miller <jaggies@google.com>
Thu, 27 Aug 2015 15:31:00 +0000 (15:31 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 15:31:00 +0000 (15:31 +0000)
* commit 'c041d01e472cbe30748d1e51de7155c145237b9f':


Trivial merge