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

* commit 'aefc0ed9677233d5e8c991196f970222b4899dc3':
  Don't upgrade some settings from GB to ICS.
tree: 6612a4783a0af5dacf89a520c8ea80420dc0103b
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. MODULE_LICENSE_APACHE2
  7. NOTICE