tree 6af9e2247a1705458c75a1fafa341e787e822b57
parent 2b53748a2139ff069fd6cff16e145fc784fdc5b3
parent 42d6843aa459a442f6680721d2e30bfb6e9abee3
author Daichi Hirono <hirono@google.com> 1490169594 +0000
committer android-build-merger <android-build-merger@google.com> 1490169594 +0000

Merge "Stop holding mProxyLock while downloading PAC script data." am: 7b26041ccc
am: 42d6843aa4

Change-Id: Idc1b507555415d467669c7e1d1c9035b449de763