OSDN Git Service

am d60e1b5b: cherrypick from hc-mr1 Change-Id: I7553282b2f3268672f79d9d75d63ce23bcdf1bf5
authorRobert Ly <robertly@google.com>
Wed, 22 Jun 2011 19:52:25 +0000 (12:52 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 22 Jun 2011 19:52:25 +0000 (12:52 -0700)
* commit 'd60e1b5b9132c6dba912fd5b4f5d7e12fd816244':
  cherrypick from hc-mr1 Change-Id: I7553282b2f3268672f79d9d75d63ce23bcdf1bf5


Trivial merge