OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Sat, 3 Mar 2012 00:41:32 +0000 (16:41 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Sat, 3 Mar 2012 00:41:32 +0000 (16:41 -0800)
commit719c9e027297693d8874a4c3f8864387b9a93154
treecb5a7174747aedb658f5e270d9b473fb5e5fb90f
parent0f03bad3fe7e82838c3bedf220fcf1c1056f6ffb
parent081c50ffc5697cef02de897c2bba80585103415e
Reconcile with ics-mr1-release

Change-Id: I2484dad4a2ab183880aeede3685b6e0bae83ab82