| commit | ec24e7d3a804aeaa82a1af7ddae0d563c725544c | [log] [tgz] |
|---|---|---|
| author | Grace Kloba <klobag@google.com> | Tue Jan 12 11:57:02 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 12 11:57:02 2010 -0800 |
| tree | e440180dd27bbcbd7ccfdb7c6b9de2fa2cd9758e | |
| parent | 1c993bfb622d7241dc244495a8add61e957703d1 [diff] | |
| parent | ba5220fc0c19c1efb65f6855e6b0bf680c30b6e8 [diff] |
am ba5220fc: (-s ours) am ce63c639: Merge "DO NOT MERGE." into eclair Merge commit 'ba5220fc0c19c1efb65f6855e6b0bf680c30b6e8' * commit 'ba5220fc0c19c1efb65f6855e6b0bf680c30b6e8': DO NOT MERGE.