| commit | 673a908609f419eb8a9527a769725e4851d8d0ea | [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 | a7c8ee7d12af3341b68eed13a496ff64815c6cc8 | |
| parent | cd8a1138e4023566acbe1ba126c7da0fea7ee33c [diff] | |
| parent | 647b382a88205bf58bd570113e53a08f8c5e9855 [diff] |
am dbf68aa3: (-s ours) am 54a4a66d: am 9ae9763b: (-s ours) Merge change Ib097fbbf into eclair Merge commit 'dbf68aa372078f4f55a267e1eb182dd360384467' * commit 'dbf68aa372078f4f55a267e1eb182dd360384467': DO NOT MERGE Reverting change I53e91db7.