OSDN Git Service

Reconcile with ics-factoryrom-release
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 20 Sep 2011 14:43:10 +0000 (07:43 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 20 Sep 2011 14:43:10 +0000 (07:43 -0700)
Change-Id: I8bb64c1b31c7158d931fd9f7be8a9e5b317c5252


Trivial merge