OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 1 Feb 2012 16:49:49 +0000 (08:49 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 1 Feb 2012 16:49:50 +0000 (08:49 -0800)
commite8308aa156e8bc751fd7ae27dbb16eac8251f6a1
tree485b152b97bf8321fdd223f35587bb4294672be8
parente9a01c3838fbea361dcc257ff726a471cf5cf7be
parent91741bc2e67a16e16fb9ddc31b1be0af34085d49
Reconcile with ics-mr1-release

Change-Id: I79900da9bc339bad1350124768b53026f465a345