OSDN Git Service

Reconcile with ics-factoryrom-release
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 21 Sep 2011 13:19:14 +0000 (06:19 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 21 Sep 2011 13:19:15 +0000 (06:19 -0700)
Change-Id: Ia810d54c1fafa6502c251e6e5b3334a8c39e0a1a


Trivial merge