| commit | 9e29d82925f83233263ac4b245f93c4f47d6618a | [log] [tgz] |
|---|---|---|
| author | Grace Kloba <klobag@google.com> | Thu Jan 14 19:32:45 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 14 19:32:45 2010 -0800 |
| tree | 02e006c44a49085c3359169c33b2dcaed4d96203 | |
| parent | ee697f35715e4174cb6e91fde1e17eac061dba97 [diff] | |
| parent | b1796e407e1162b422a104487a2fa726cd53f2ca [diff] |
am 4d69ac66: Merge "DO NOT MERGE" into eclair Merge commit '4d69ac6695246b8df06a6583044dc4712d81a956' into eclair-plus-aosp * commit '4d69ac6695246b8df06a6583044dc4712d81a956': DO NOT MERGE