| commit | 286f0cdb9cc3b0e1ce70de10eee370f8b59f3f3c | [log] [tgz] |
|---|---|---|
| author | Wei-Ta Chen <weita@google.com> | Wed Jan 26 21:14:01 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 26 21:14:01 2011 -0800 |
| tree | e366f62f3f33e52ae8a4bcc728b510dd64cbc5c1 | |
| parent | 27c2e1a63730561332f4d3c406c7e9b7c36963d2 [diff] | |
| parent | 46c05833c257ab46c42182cbb2ae359892d14443 [diff] |
am 46c05833: (-s ours) Do not merge. * commit '46c05833c257ab46c42182cbb2ae359892d14443': Do not merge.