OSDN Git Service

Merge changes Ic9531e3c,I3f04433b into froyo
authorBen Murdoch <benm@google.com>
Thu, 1 Apr 2010 15:42:14 +0000 (08:42 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 1 Apr 2010 15:42:14 +0000 (08:42 -0700)
* changes:
  Cherry pick from master.
  Cherry pick from master.


Trivial merge