OSDN Git Service

Reconcile with ics-mr0-release
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 8 Nov 2011 19:08:20 +0000 (11:08 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 8 Nov 2011 19:08:20 +0000 (11:08 -0800)
Change-Id: I382741a2a6c99247d214583ee0488cf1ab9c3ce3


Trivial merge