OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 19 Jan 2012 21:06:24 +0000 (13:06 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 19 Jan 2012 21:06:24 +0000 (13:06 -0800)
Change-Id: Iece5fc7cf15320addfda3f143235664e2ef3083d


Trivial merge