OSDN Git Service

Reconcile with ics-mr0-release
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 1 Nov 2011 21:28:52 +0000 (14:28 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 1 Nov 2011 21:28:52 +0000 (14:28 -0700)
commit512879f4c548233d14a2c9cf86a386574ae3d1b1
treec4d1ca0e64c03577bf372444ae461db41b6d9943
parentab5b6ecdde30cd86a01d21bd6aae003986f0df4c
parent598e41b555d6fbff60ba14ea5c97c7789f1fa846
Reconcile with ics-mr0-release

Change-Id: Ide415fc461dfd7d5899b51cb07f380e9ca95ed6b