OSDN Git Service

Reconcile with ics-factoryrom-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 29 Sep 2011 21:25:11 +0000 (14:25 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 29 Sep 2011 21:25:11 +0000 (14:25 -0700)
Change-Id: I83684406f2c3ac17cc89b746b27fb5a04333459b


Trivial merge