commit | 6dec1f60ae6684c6a6f5a823b0af5574b4263f74 | [log] [tgz] |
---|---|---|
author | Jim Miller <jaggies@google.com> | Tue Nov 24 14:47:02 2009 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 24 14:47:02 2009 -0800 |
tree | e62f82b39e8a6b84ca103806c13228412cc2026e | |
parent | 92112f02065ff22e9a4f671f73f892bb47e77846 [diff] | |
parent | f8da578ee7d398f21e002947505cddf827937a98 [diff] |
am f8da578e: resolved conflicts for merge of a442e791 to eclair-mr2-plus-aosp Merge commit 'f8da578ee7d398f21e002947505cddf827937a98' * commit 'f8da578ee7d398f21e002947505cddf827937a98': Fix 2268841: Updated portrait tab lockscreen to match latest PPL.