OSDN Git Service

Merge "cherrypick from hc mr1 Change-Id: I0685106aba681a429ce92c0ec1a4fab592d186ac...
authorRobert Ly <robertly@google.com>
Tue, 14 Jun 2011 23:36:17 +0000 (16:36 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 14 Jun 2011 23:36:17 +0000 (16:36 -0700)

Trivial merge