| commit | d6dc43bf4f6decb5ff6bdec1a4edc6be6b4deb73 | [log] [tgz] |
|---|---|---|
| author | Grace Kloba <klobag@google.com> | Mon Mar 01 16:27:44 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 01 16:27:44 2010 -0800 |
| tree | 2f93ac7d6396d1684cc1dd42fc7e5139b9c8c28b | |
| parent | 918a95b9c99c4f0a4f4ffbed9d75190ff6f09421 [diff] | |
| parent | c0524d26a6bcfa28a930f446717dffcd9ce3c3f5 [diff] |
am c0524d26: (-s ours) am 3ff7cecd: Merge "DO NOT MERGE" into eclair-mr2 Merge commit 'c0524d26a6bcfa28a930f446717dffcd9ce3c3f5' * commit 'c0524d26a6bcfa28a930f446717dffcd9ce3c3f5': DO NOT MERGE