| commit | aa4b67c871be67234f8376fc219fcc56fce4b55e | [log] [tgz] |
|---|---|---|
| author | Irina Dumitrescu <irinaid@google.com> | Fri Jan 25 05:53:50 2019 -0800 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jan 25 05:53:50 2019 -0800 |
| tree | b948fcd1e2e77bcc0cc75ad4a764fd681776495b | |
| parent | 907a204618fb275f8186090d241f316d4ae73318 [diff] | |
| parent | 4674a9c4340dd24637f575ff34540465b2b81d91 [diff] |
Merge "Showcase HTTP proxy usage in ToyVPN." am: 0278c48f47 am: 4674a9c434 Change-Id: I275e1001007564dbfd17c00d14a7bce1a71eba71