OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 26 Mar 2012 17:18:02 +0000 (10:18 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 26 Mar 2012 17:18:02 +0000 (10:18 -0700)
Change-Id: I9d8982c6fae0eb770c95f3b480bc6be0976c11b2


Trivial merge