OSDN Git Service

Reconcile with ics-mr0-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 18 Nov 2011 21:12:32 +0000 (13:12 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 18 Nov 2011 21:12:33 +0000 (13:12 -0800)
Change-Id: I805d2b484b72fb640a889ff2a4b67944cbbe012a


Trivial merge