OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 16 Dec 2011 16:08:07 +0000 (08:08 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 16 Dec 2011 16:08:07 +0000 (08:08 -0800)
commita9798d3c1f1c9787975dc0f16e2191da95f2f0da
treec5f62a947aa04afb4e3f5f8f8ddbb569ff8fa0c0
parent7e2f99569ae7d22307957abecc2e1818b4e7ab5e
parentf61ea45c823814371c8ced71a4023f9b2cd05a3b
Reconcile with ics-mr1-release

Change-Id: Ib2cbd92ed2d3567e22921b66ca2202a968fdd0da