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