OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 16 Feb 2012 18:10:54 +0000 (10:10 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 16 Feb 2012 18:10:54 +0000 (10:10 -0800)
commitaa5bdb1afac03ece211f0375372fcc7d35e4fbbd
tree065afe21914662e958c7a37019c73278b9a3e91b
parent4e1e57fdba6999cb46f1f72eb529ffbb68be83a6
parenta66c0c1b4545131a78b6760d7c8ce6e09dd5e1f5
Reconcile with ics-mr1-release

Change-Id: I5fc102975a6f3ef9fe1fa8c73260b9571dce0e1a