OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 13 Dec 2011 13:11:37 +0000 (05:11 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 13 Dec 2011 13:11:37 +0000 (05:11 -0800)
commitd2884199bda058c13e79f01e9ece26c0334d1d9c
tree8e3d79f8b4eda0315e5d41b49386df6bc7a541cf
parenta2c1261e719b4fbac9eee4e348b629360870468f
parent8590bd19ebebb35f7e9c8a70757bbf124f174f99
Reconcile with ics-mr1-release

Change-Id: I4e8279a5f59137d2ec2add324d117701ade68a8c