tree 828ad40f183adc761c5793d25e0d3e373d7f90b0
parent 852434e616aba0607e71143022e8b7cb2362e639
parent 9aaef409bcb7b13df98ce20284d4b12345207d01
author David Turner <digit@android.com> 1313701694 -0700
committer Android Code Review <code-review@android.com> 1313701694 -0700

Merge "Fix internet connectivity of emulator over proxy" into tools_r13