| commit | 73cbbc3d6405120de8f5bd150d75ab7ace8b6b14 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Jun 25 05:59:30 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 25 05:59:30 2013 -0700 |
| tree | 2ff05d1316790c6174d14d7699dc0be325123aff | |
| parent | a6bfa1c3ba8f82ce77da40b21d88959e3486172c [diff] | |
| parent | 5a0f66524410834f2c425a5b9cf87b5f6f738472 [diff] |
am 5a0f6652: am 5b3afe3a: am 4be48d43: (-s ours) Merge "Lockscreen : Reference correct layout" * commit '5a0f66524410834f2c425a5b9cf87b5f6f738472': Lockscreen : Reference correct layout