OSDN Git Service

Merge "cherrypick from hc-mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7...
authorRobert Ly <robertly@google.com>
Mon, 20 Jun 2011 16:37:51 +0000 (09:37 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 20 Jun 2011 16:37:51 +0000 (09:37 -0700)

Trivial merge