OSDN Git Service

am 5a0f6652: am 5b3afe3a: am 4be48d43: (-s ours) Merge "Lockscreen : Reference correc...
authorJean-Baptiste Queru <jbq@google.com>
Tue, 25 Jun 2013 12:59:30 +0000 (05:59 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 25 Jun 2013 12:59:30 +0000 (05:59 -0700)
* commit '5a0f66524410834f2c425a5b9cf87b5f6f738472':
  Lockscreen : Reference correct layout


Trivial merge