tree 27bbc5d508fc7a2ddaa93dcf8bdc84e0ba691b97
parent 6e5b8287be82cd061d78c6bc07d086b3ebb8f841
parent 1543c668afd4326e2a3f4ad39bcd8ec5b6ca5d27
author Amith Yamasani <yamasani@google.com> 1321564822 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321564822 -0800

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.