Eric Olsen 8e49e998fd am 62335430: Merge change I4499ad72 into eclair
Merge commit '62335430b05d92ad2255bf20b76b35e012b385c9' into eclair-plus-aosp

* commit '62335430b05d92ad2255bf20b76b35e012b385c9':
  Fix bad merge fixes build breakage.
2009-11-04 17:36:26 -08:00
..