commit | 3d0024ecda26b442a085e1496a76745809f60678 | [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 | 8ebd6a241630e973ff23354f659605bdab7d90d1 | |
parent | 674df1b373c98e0d868de980c8c4ef4703202f36 [diff] | |
parent | c55a6a42afd328fd78e8cc307194e2ca33b81a04 [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