OSDN Git Service

Merge change 24630 into eclair
authorAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 11 Sep 2009 01:27:20 +0000 (21:27 -0400)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 11 Sep 2009 01:27:20 +0000 (21:27 -0400)
* changes:
  resolved conflicts for merge of e0408aa1 to eclair


Trivial merge