OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 30 Nov 2011 20:55:39 +0000 (12:55 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 30 Nov 2011 20:55:39 +0000 (12:55 -0800)
Change-Id: I00b8d5eecea650df527aa3c21bb4a7270a196401


Trivial merge