OSDN Git Service

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


Trivial merge