am 694b266e: am 7b6d238b: Merge "Fix tethering interaction from wifi" into ics-mr1

* commit '694b266e0366e5400d577659d1bb8152f0a106e7':
  Fix tethering interaction from wifi
tree: 85822ab685c49f5d1d6d926edcc427799019f3a8
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. MODULE_LICENSE_APACHE2
  7. NOTICE