commit | 001e423026738b76f0a116f17bb9e3026a55a1dc | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri Dec 09 14:57:48 2011 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 09 14:57:48 2011 -0800 |
tree | 8cef08e323746a2ae01800c70e083ad67d7fcb9a | |
parent | 3a51491c7ee822792ef1e6767055a45cc4e9b3e6 [diff] | |
parent | ddbd1fd2bd09e7252464b3b2b4e9d2f37bcc155e [diff] |
am 54854d31: Reconcile with ics-mr0-release ics-mr1-release * commit '54854d311731b321e2bb2faec06bacb11d1fe07f': More fixing for issue #5366535: Lockscreen has wrong layout... DO NOT MERGE. Integrate from MR 1 to fix issue #5366535: Lockscreen...