OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 1 Feb 2012 16:50:41 +0000 (08:50 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 1 Feb 2012 16:50:41 +0000 (08:50 -0800)
Change-Id: I298ee044e83510a9caa19f51e94567863861a8a0


Trivial merge