| commit | 1b2ecd96f193982474d609cc06ac9e41dc46c380 | [log] [tgz] |
|---|---|---|
| author | Vasu Nori <vnori@google.com> | Wed Sep 22 13:54:08 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 22 13:54:08 2010 -0700 |
| tree | f196ee75996dea787ba87d8cff0f51baa4075d36 | |
| parent | 259758604869eca04fc85f46612c38d4e49fcfd2 [diff] | |
| parent | 6ff7a2474f8c694c4870981efdaca36390056f5b [diff] |
am c55a6a42: (-s ours) am 2359d49b: Merge "DO NOT MERGE - redo Ib5e519fb40d3191ecac06c03a844872df19f3963" into gingerbread Merge commit 'c55a6a42afd328fd78e8cc307194e2ca33b81a04' * commit 'c55a6a42afd328fd78e8cc307194e2ca33b81a04': DO NOT MERGE - redo Ib5e519fb40d3191ecac06c03a844872df19f3963