OSDN Git Service

Reconcile with ics-mr0-release ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 8 Dec 2011 18:21:25 +0000 (10:21 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 8 Dec 2011 18:21:25 +0000 (10:21 -0800)
Change-Id: I7bc70364e017d1c67bcc4b308e0aff5eaa19e661


Trivial merge