OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 14 Dec 2011 03:10:04 +0000 (19:10 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 14 Dec 2011 03:10:04 +0000 (19:10 -0800)
commit5b08f6499a2bcd97ec88ae2719edb90d025cd298
tree8e3d79f8b4eda0315e5d41b49386df6bc7a541cf
parentd2884199bda058c13e79f01e9ece26c0334d1d9c
parent531a546ebafd9ae4845bdb0704c558c82815d5f3
Reconcile with ics-mr1-release

Change-Id: Ibbd535845a392e5749d367ce406e7d5251b6d83f