OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 5 Jan 2012 15:45:28 +0000 (07:45 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 5 Jan 2012 15:45:28 +0000 (07:45 -0800)
Change-Id: I8a74c329fc7dd115e36d5180fab8e8680d6df4f8


Trivial merge