am 1146bddf: Merge "Always clear settings when entering Inactive state." into honeycomb-LTE

* commit '1146bddf92fc91dad384bdaea740f9472bebd911':
  Always clear settings when entering Inactive state.
tree: 01e09e2a5586c79999831795bce23b509374fcce
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE