commit | 5a0f66524410834f2c425a5b9cf87b5f6f738472 | [log] [tgz] |
---|---|---|
author | Jean-Baptiste Queru <jbq@google.com> | Mon Jun 24 15:13:28 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 24 15:13:28 2013 -0700 |
tree | b3cfe44758b690f1a9496afeb49e5acc7735d872 | |
parent | 602bc43266d357765b80cabee7541724e184f44a [diff] | |
parent | 5b3afe3a84cad94642360df01c39ebb2a3ee14ba [diff] |
am 5b3afe3a: am 4be48d43: (-s ours) Merge "Lockscreen : Reference correct layout" * commit '5b3afe3a84cad94642360df01c39ebb2a3ee14ba': Lockscreen : Reference correct layout