OSDN Git Service

am 4e400158: am 1e4cf2dd: am 10a36020: cherrypick from hc-mr1 Change-Id: Ib0d980c95d8...
authorRobert Ly <robertly@google.com>
Wed, 13 Jul 2011 21:54:44 +0000 (14:54 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 13 Jul 2011 21:54:44 +0000 (14:54 -0700)
* commit '4e4001589911b971d56c72acee140526d4575dac':
  cherrypick from hc-mr1 Change-Id: Ib0d980c95d821ba24e342f230b4a47fd786ba66a


Trivial merge