OSDN Git Service

[automerger skipped] Merge "Add API for proxy configuration over VPN." am: 8b5917965d...
authorIrina Dumitrescu <irinaid@google.com>
Thu, 24 Jan 2019 19:14:25 +0000 (11:14 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 24 Jan 2019 19:14:25 +0000 (11:14 -0800)
commita33faabf5e6cd36e34c852ace1496da4b2597a16
tree07b95b05e5ccb63d3e4f108444f65c69497b84db
parent00ef0419d1b8bc6c943f87c0f7a8f192c6e1b51f
parentb866a5b6e66eeba1eb38a9420775676c154ae211
[automerger skipped] Merge "Add API for proxy configuration over VPN." am: 8b5917965d am: ac77629a1e
am: b866a5b6e6 -s ours
am skip reason: change_id Id4dde4a4103fd93bfbbacc52d0e5ade56ae67a6a with SHA1 18622d3d35 is in history

Change-Id: I1b5f49892d2ff473b5fe7d3d1e71e3cd3ffaca26