am 664bb774: am aefc0ed9: Merge "Don\'t upgrade some settings from GB to ICS." into ics-mr1

* commit '664bb774f528fead63d7c0e62b533da66390b246':
  Don't upgrade some settings from GB to ICS.
This commit is contained in:
Amith Yamasani 2011-11-17 13:20:22 -08:00 committed by Android Git Automerger
commit 5466d0f3c1

Diff Content Not Available