OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 18 Nov 2011 23:43:37 +0000 (15:43 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 18 Nov 2011 23:43:37 +0000 (15:43 -0800)
Change-Id: I1693539643fe35d4ffc893bf9b5444fd416756f2


Trivial merge