OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 21 Mar 2012 16:00:34 +0000 (09:00 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 21 Mar 2012 16:00:34 +0000 (09:00 -0700)
commit8544aac859400ee7c0109f996930b22455028dbe
tree51046165ed70f824a59244016a7347dc50ad14a5
parent0d1630a34dc6ecf59c67ee4a51569fe7e933649d
parent54578dd1aad3dce8c999e15d6ec7cee87fbef6f8
Reconcile with ics-mr1-release

Change-Id: If78df17136dfe425e6752b315590b47d4c135d21