am 1acce421: Reconcile with ics-mr1-release

* commit '1acce4219d3e8e2607bfddd171ddeb0c11201ae4':
main
The Android Open Source Project 2011-12-02 07:57:01 -08:00 committed by Android Git Automerger
commit c98c467794

Diff Content Not Available