OSDN Git Service

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


Trivial merge