OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Sat, 7 Jan 2012 02:15:13 +0000 (18:15 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Sat, 7 Jan 2012 02:15:14 +0000 (18:15 -0800)
Change-Id: Id0aeb30eb75c6c4aee7abbc9877aa5b16389778c


Trivial merge