OSDN Git Service

Reconcile with ics-factoryrom-release
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 26 Sep 2011 19:11:29 +0000 (12:11 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 26 Sep 2011 19:11:29 +0000 (12:11 -0700)
Change-Id: I4096cbbfd0bae1f7c08c9731f522529d3895d2d8


Trivial merge