OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 14 Dec 2011 03:10:39 +0000 (19:10 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 14 Dec 2011 03:10:39 +0000 (19:10 -0800)
Change-Id: I4d2578e9635a5585c499f7ffcd816c5cf6876b3f


Trivial merge