OSDN Git Service

Reconcile with ics-factoryrom-2-release
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 16 Nov 2011 16:55:32 +0000 (08:55 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 16 Nov 2011 16:55:32 +0000 (08:55 -0800)
commit7f3c884831123bc3292264054a77fb0d400d4996
tree365a5e5882dda66825c210c3e78f5cc9e071ff5b
parenta5f534df07a598f3fc9d353a1a9a0ff6c09cfbc0
parenta5158b31d97e25832d778a41a31df6ece0fc627e
Reconcile with ics-factoryrom-2-release

Change-Id: I2059be2fb54d852023cb4e4b96493ff6a934ffe0