| commit | 0afdef649baf1a7299f67d72db1c18578400c708 | [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 | adc93794bbb9bb07e84cbb12fdd0ca9c4d8ae13b | |
| parent | 8443e656fad9d606112bdd7cad99a5337f56d4b8 [diff] | |
| parent | 1f9ab2095ac322780aa1b17fbb91936f6ea37c97 [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.