OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 14 Dec 2011 04:03:11 +0000 (20:03 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 14 Dec 2011 04:03:11 +0000 (20:03 -0800)
Change-Id: I4518215eb5788221551703ab02142d909644c1a7


Trivial merge