OSDN Git Service

Reconcile with ics-mr0-release
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 7 Dec 2011 15:24:54 +0000 (07:24 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 7 Dec 2011 15:24:54 +0000 (07:24 -0800)
Change-Id: I5341d7d7de8ec8dfa86095e8d8d45a912bb01a47


Trivial merge