OSDN Git Service

am cbd31aec: Merge "cherry pick from hc mr1 Change-Id: Icd86c888b061e7b6770363443fea4...
authorRobert Ly <robertly@google.com>
Tue, 14 Jun 2011 22:01:48 +0000 (15:01 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 14 Jun 2011 22:01:48 +0000 (15:01 -0700)
* commit 'cbd31aec9f4a7367d440bfb0c9683bd481461995':
  cherry pick from hc mr1 Change-Id: Icd86c888b061e7b6770363443fea490c49b7739e


Trivial merge