OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 1 Mar 2012 18:39:57 +0000 (10:39 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 1 Mar 2012 18:39:57 +0000 (10:39 -0800)
commit0f03bad3fe7e82838c3bedf220fcf1c1056f6ffb
treecb5a7174747aedb658f5e270d9b473fb5e5fb90f
parentd58f3d2bc47015f7a55b88ff56850b9990689e22
parent067153c05966b1e6e9e78f76f2b8356a3c3b8876
Reconcile with ics-mr1-release

Change-Id: I33df3a369f056bd2369452fd056e0de355e6f9b4