OSDN Git Service

am 4be48d43: (-s ours) Merge "Lockscreen : Reference correct layout"
authorJean-Baptiste Queru <jbq@google.com>
Mon, 24 Jun 2013 21:27:28 +0000 (14:27 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 24 Jun 2013 21:27:28 +0000 (14:27 -0700)
commit5b3afe3a84cad94642360df01c39ebb2a3ee14ba
tree84aa5c5388c6b49f5c044244dc6a027aa20c6510
parent7334d25e79d733b419aacfd706aad762f823f2f9
parent4be48d436bb2d8d2207b317f9a826c27671b6d4b
am 4be48d43: (-s ours) Merge "Lockscreen : Reference correct layout"

* commit '4be48d436bb2d8d2207b317f9a826c27671b6d4b':
  Lockscreen : Reference correct layout