OSDN Git Service

Reconcile with ics-mr0-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 28 Oct 2011 20:05:26 +0000 (13:05 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 28 Oct 2011 20:05:27 +0000 (13:05 -0700)
commitd211a99952da680d8e76c91181af620c939289a8
tree1c2aee418bc78773aff239d56f29b6c3cfdfb30e
parenteea1d1a382cc1cf9f2e26d65c2a262f50760e515
parent655522fef565f7810457abe672b86f004b4e8eb7
Reconcile with ics-mr0-release

Change-Id: I6997b52967863156cd151e368e891b63024ebbb1