OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 9 Dec 2011 15:10:40 +0000 (07:10 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 9 Dec 2011 15:10:40 +0000 (07:10 -0800)
Change-Id: I0a43c4d104894fdde4eff9970bc78ed0aeb88ec2


Trivial merge