OSDN Git Service

Reconcile with ics-mr0-release
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 7 Dec 2011 15:24:51 +0000 (07:24 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 7 Dec 2011 15:24:51 +0000 (07:24 -0800)
commitfebd861a073b0500b6e7f0ea117b71df3bc6822c
tree6eff22fe06153e56b74070e0d245707c3ca9be65
parentaac7b4455a4dbfab5a136628864789eba8a31bb0
parent95cc5765a8d990a71e3d0f04fa50b682274e707a
Reconcile with ics-mr0-release

Change-Id: Ifdc1b145e1f778260a1445c954ea2e7848e67c19