OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 23 Jan 2012 18:15:33 +0000 (10:15 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 23 Jan 2012 18:15:33 +0000 (10:15 -0800)
Change-Id: I6e64890cacfdb167f2f0c7a5e3917284e391ce11


Trivial merge