am 7ad85eb6: Merge "Persist wifi override in airplane mode" into honeycomb-mr1

* commit '7ad85eb62f9f332cc8002ec996cd359333ba590e':
  Persist wifi override in airplane mode
tree: ffa8444c8ca09fd26bed60ad7273697d26037c23
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE