OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 17 Feb 2012 17:02:41 +0000 (09:02 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 17 Feb 2012 17:02:41 +0000 (09:02 -0800)
commit0e51114927aecac7a283eee4d6449709027224d5
tree5eb9c2e56fb0b19666b5b885761121b0b72bc7ed
parentd9bd216ea7d3030b84c61d551b87781269e418a7
parentf37b2f20fa1f0c8aff300597fc6def1f9e56a577
Reconcile with ics-mr1-release

Change-Id: Ia3e6e7211e43f82053ebbdd87f4bfacf13d2495a