| commit | 15b31036b1527c50eb0c1f00710e561428ccd952 | [log] [tgz] |
|---|---|---|
| author | Robert Greenwalt <robdroid@android.com> | Tue Dec 08 14:50:31 2009 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 08 14:50:31 2009 -0800 |
| tree | a018907d40589554f173adf33c047bc68a5ee7a6 | |
| parent | d1b12bd772bd8dcad800ef1598bd17822a77a723 [diff] | |
| parent | cc46615416ed5620e8e3437ee7c374ee69e0943f [diff] |
am cc466154: (-s ours) am f59a2ae6: am 9ae9763b: (-s ours) Merge change Ib097fbbf into eclair Merge commit 'cc46615416ed5620e8e3437ee7c374ee69e0943f' * commit 'cc46615416ed5620e8e3437ee7c374ee69e0943f': DO NOT MERGE Reverting change I53e91db7.