OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 1 Mar 2012 18:40:59 +0000 (10:40 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 1 Mar 2012 18:40:59 +0000 (10:40 -0800)
Change-Id: Ie559363abe963201d622a17caae6827d8a22e44e


Trivial merge