OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 6 Dec 2011 17:02:57 +0000 (09:02 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 6 Dec 2011 17:02:58 +0000 (09:02 -0800)
Change-Id: I2790bcf28bdac1335b4106138fc6ad471ac40516


Trivial merge