OSDN Git Service

Reconcile with ics-factoryrom-release
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 10 Oct 2011 14:27:25 +0000 (07:27 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 10 Oct 2011 14:27:25 +0000 (07:27 -0700)
Change-Id: Ibd9094406b6984d8a27179eb934edc05d3a43321


Trivial merge