am 07a8778b: Merge "resolved conflicts for merge of b27ce984 to honeycomb-plus-aosp" into honeycomb-plus-aosp

* commit '07a8778b560ce8d46bcf5aad012be575f3a90500':
  Update networktype before sending state change.
tree: e39a0d495d57e3099393dfe124ca6f740460889f
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE