Ben Murdoch bf6913481e am 352cf1a4: Merge changes Ic9531e3c,I3f04433b into froyo
Merge commit '352cf1a45e26803a466d096ca2d679ea5a3ac249' into froyo-plus-aosp

* commit '352cf1a45e26803a466d096ca2d679ea5a3ac249':
  Cherry pick from master.
  Cherry pick from master.
2010-04-01 08:44:58 -07:00
..