OSDN Git Service

am 62335430: Merge change I4499ad72 into eclair
authorEric Olsen <eolsen@android.com>
Thu, 5 Nov 2009 01:36:59 +0000 (17:36 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 5 Nov 2009 01:36:59 +0000 (17:36 -0800)
commite772eb7af049b55c89241fae799569030c1f5570
tree658ce00086ede62d294d0f93ad93712ab35fb7b6
parent05abe8d01d91389b4b52111ed525aa4c4f4e1b71
parent62335430b05d92ad2255bf20b76b35e012b385c9
am 62335430: Merge change I4499ad72 into eclair

Merge commit '62335430b05d92ad2255bf20b76b35e012b385c9' into eclair-mr2

* commit '62335430b05d92ad2255bf20b76b35e012b385c9':
  Fix bad merge fixes build breakage.