OSDN Git Service

Reconcile with ics-factoryrom-release
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 19 Sep 2011 15:00:33 +0000 (08:00 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 19 Sep 2011 15:00:33 +0000 (08:00 -0700)
Change-Id: I849876516cfa315f96ac984b52fc6dc21e053577


Trivial merge