Merge "Wait for proxy to start."
tree: f4e51df34afbac78f4edcdbd28d12db32e0639fa
  1. comm/
  2. res/
  3. src/
  4. Android.mk
  5. AndroidManifest.xml