OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 30 Jan 2012 21:36:23 +0000 (13:36 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 30 Jan 2012 21:36:23 +0000 (13:36 -0800)
commit4e29e3986710c4078faaac9ae662d8f79d74d51f
treeb88646282f9d7435d8487c3082e2182ac58dcb46
parentc73e26f3bd038b17e60e24d0ed4d6e125bc2ef00
parent5583c80be1dba9db2205e6e02a1f02dbbae4fd4c
Reconcile with ics-mr1-release

Change-Id: Iae7c919c7e0b4dcbf024514431421cdfd225a507