OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 7 Feb 2012 18:09:02 +0000 (10:09 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 7 Feb 2012 18:09:02 +0000 (10:09 -0800)
commit62a16e230529ec015518a3abac872ab008892e2d
tree1ac8d25a8af8c082c7d123ee1da3396f5289844d
parentca2cd25b3542749e491b1c00aeca5d3f59c99ad9
parenta7af7e050e41fc80d418b8b0cdeded5889daae2e
Reconcile with ics-mr1-release

Change-Id: I8399f0a69c4192e7ef65e3097e7a6820e400e436