OSDN Git Service

am 3f3b8cbf: Merge "cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba...
authorRobert Ly <robertly@google.com>
Fri, 8 Jul 2011 17:39:46 +0000 (10:39 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 8 Jul 2011 17:39:46 +0000 (10:39 -0700)
* commit '3f3b8cbfa775f2ebff985c069300f8daaeb7a84c':
  cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052


Trivial merge