OSDN Git Service

Reconcile with ics-mr0-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 8 Dec 2011 18:26:01 +0000 (10:26 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 8 Dec 2011 18:26:01 +0000 (10:26 -0800)
Change-Id: I0924e5f898c11034b62b991876bac7e53dd0eebc


Trivial merge