OSDN Git Service

Reconcile with ics-mr0-release
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 29 Nov 2011 15:54:00 +0000 (07:54 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 29 Nov 2011 15:54:00 +0000 (07:54 -0800)
Change-Id: I612e5d0bd573f86dd61cbe0b47d0b691973539a5


Trivial merge