OSDN Git Service

Reconcile with ics-factoryrom-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 16 Sep 2011 19:52:53 +0000 (12:52 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 16 Sep 2011 19:52:53 +0000 (12:52 -0700)
Change-Id: I95804a1a46496e2ba9336831eaeac9ae58d12d17


Trivial merge