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

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