OSDN Git Service

am 4963cd0b: am 1a3e7cf2: Merge "cherry pick from hc mr1 Change-Id: I6f48d245e2837226...
authorRobert Ly <robertly@google.com>
Wed, 15 Jun 2011 00:51:08 +0000 (17:51 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 15 Jun 2011 00:51:08 +0000 (17:51 -0700)
* commit '4963cd0bd1d63fe5a444b2299758d2a2696776f1':
  cherry pick from hc mr1 Change-Id: I6f48d245e2837226096fe42d08fb0243e416dbbc


Trivial merge