| commit | 6e494e9457499c6124fe223916a5896c88e82af7 | [log] [tgz] |
|---|---|---|
| author | Benedict Wong <benedictwong@google.com> | Fri Aug 31 11:45:09 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Aug 31 11:45:09 2018 -0700 |
| tree | 73223d056b5a3328fd57bdff99a834dc342cfccc | |
| parent | 8971d804ee5428070e098c4e08db454b2cc82814 [diff] | |
| parent | 74fc889c8cce050f0096e7ae75552e59b23ca4c3 [diff] |
Merge "Merge "Use tunnel local/remote addresses in security policies" am: 8424a78b75 am: f4c8a61ad7" into pi-dev-plus-aosp am: 74fc889c8c Change-Id: I1c5c03777f1ae8dc3bc08096a06824d99a982738