OSDN Git Service

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


Trivial merge