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

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