am c1a005c3: Merge "Fix the Uri parsing issue" into honeycomb-mr2

* commit 'c1a005c356c18ffb676f16b2f6d6d8f361abafe2':
  Fix the Uri parsing issue
tree: ca71c6d33946a3c1ca9f2d1e73b0322d401ba3d9
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE