OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 21 Dec 2011 15:19:46 +0000 (07:19 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 21 Dec 2011 15:19:46 +0000 (07:19 -0800)
Change-Id: I35894bf1394fd007afa6cca910b2d9ae18ffdb49


Trivial merge