OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 5 Jan 2012 15:45:28 +0000 (07:45 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 5 Jan 2012 15:45:28 +0000 (07:45 -0800)
commit22bf648b0b5484834850667664912b660df28585
tree2ffdfd9dbc064aa3d2a9b229f87b679220ef4f79
parentfe0698f9d44ca923ff1ba528f2c42019937ea5e2
parent1c03729ed505d5ad66b72ea6ee921d8bb06245c6
Reconcile with ics-mr1-release

Change-Id: I8a74c329fc7dd115e36d5180fab8e8680d6df4f8