OSDN Git Service

Reconcile with ics-factoryrom-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 6 Oct 2011 12:44:04 +0000 (05:44 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 6 Oct 2011 12:44:04 +0000 (05:44 -0700)
Change-Id: I7c2f0791fec871bd499afc9eaa41fd1dc55b91c5


Trivial merge