am b0e5326d: (-s ours) am a46a5cba: Merge "DO NOT MERGE No backup of country and sleep policy" into honeycomb

* commit 'b0e5326d8cc661448a7ff611d02d439d4a328a3d':
  DO NOT MERGE No backup of country and sleep policy
tree: 899e555f67bd2818d2ea4081668a79c0c77958fb
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE