OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 13 Dec 2011 13:11:37 +0000 (05:11 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 13 Dec 2011 13:11:37 +0000 (05:11 -0800)
Change-Id: I4e8279a5f59137d2ec2add324d117701ade68a8c


Trivial merge