| commit | 28efe25149cf4ba084146fd1b3cbf9504fcd2dc3 | [log] [tgz] |
|---|---|---|
| author | Grace Kloba <klobag@google.com> | Tue Jan 19 16:34:11 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 19 16:34:11 2010 -0800 |
| tree | d99571e6880423eb6f5a1c43e59f1fc5629e82a4 | |
| parent | b49d9af7e1205312cc25e23636ef3980bee4c1b0 [diff] | |
| parent | 181963a0200e7c442d66f9f893da41e2b52a4d8c [diff] |
am 181963a0: (-s ours) am 196926b9: Merge "DO NOT MERGE" into eclair Merge commit '181963a0200e7c442d66f9f893da41e2b52a4d8c' * commit '181963a0200e7c442d66f9f893da41e2b52a4d8c': DO NOT MERGE