| commit | 5e285d001ad1e535626943609b97a853a80500e6 | [log] [tgz] |
|---|---|---|
| author | Wei-Ta Chen <weita@google.com> | Thu Jan 13 12:40:51 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 13 12:40:51 2011 -0800 |
| tree | e366f62f3f33e52ae8a4bcc728b510dd64cbc5c1 | |
| parent | 27c2e1a63730561332f4d3c406c7e9b7c36963d2 [diff] | |
| parent | d11c97566df5698008cc33934c54264049a5b92e [diff] |
am d11c9756: (-s ours) am 46c05833: (-s ours) Do not merge. * commit 'd11c97566df5698008cc33934c54264049a5b92e': Do not merge.