tree f9ac3a2cda73e0135364ac1214048322d84eef1c
parent de50d0ab2008cbf836dc4fcbe9131a2071265946
parent 8508a073523f02837c767d6c3d62ca8f623b1f40
author Raphael <raphael@google.com> 1308778532 -0700
committer Raphael <raphael@google.com> 1308778532 -0700

resolved conflicts for merge of 8508a073 to honeycomb-plus-aosp

Change-Id: I376928881adb0e9fd62fabc1e21542bf0d700ca2