OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 15 Dec 2011 00:05:32 +0000 (16:05 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 15 Dec 2011 00:05:32 +0000 (16:05 -0800)
commit3453bf678e3d0187015cdde1c9263299ea361726
tree52cb291bf974f4593277cc1142e514ebadae4b89
parent26c2a6bf34b370d467cab4753e5a4b187ba62c0f
parentd2bc4e0683eb6d1b7ac9731cc27ab46dc3e016af
Reconcile with ics-mr1-release

Change-Id: I1b745b11729a3fda14ffe44f1f44854e087318c7