OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 24 Feb 2012 22:05:51 +0000 (14:05 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 24 Feb 2012 22:05:51 +0000 (14:05 -0800)
commit2ddd7b3e8753816ccaaf5e2fe5b0b51892c4c853
tree3a57d70948046c3f842bdbb7e66fc0c89b797ab4
parentf31297edf899997dc9f173f6ddca30b0e4f2d677
parentb585b9f4007fc31040af16d90c1e321460f30f73
Reconcile with ics-mr1-release

Change-Id: Ib2f215bb3db0195c35ca5bc645df38d46061dc7e