tree b12215871cf48401489c6d52043531d96a711af3
parent c1e2d09f531717e7d0e853a6ea34ac605279ca83
parent 0cfe31b2d0192dd7806ad851aea446aefd7717f0
author Emily Bernier <ember@google.com> 1465426043 +0000
committer android-build-merger <android-build-merger@google.com> 1465426043 +0000

am 548e12e1: Merge \\"Update proxy resolver and tests for V8 API changes.\\" am: 3451232e59
am: 0cfe31b2d0

Change-Id: I594b2062443e287a1e6f1126153afb99ea008979