Merge "Fix build." into eclair
authorBrett Chabot <brettchabot@android.com>
Thu, 11 Feb 2010 20:27:59 +0000 (12:27 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 11 Feb 2010 20:27:59 +0000 (12:27 -0800)
commit639b823b287211a67e525238c5f2f4e2a9ebc0c6
treed28652020aba47e3d958f3afc8e9b168a641fe45
parent8bbe558c4fbff327dcb91acd42f4c927079c7359
parent5d7d62cd294ece842fd5a9cd9abd5a628a5c1a11
Merge "Fix build." into eclair