tree 7bc3d1b58f4c1c54a7b787ad0b07010ff41fb0d2
parent 5124226629b0d5753757436b72d85e7aa46ce1dc
parent 2cb2f7119ffa3b51abc005771c45072dd01aaa7d
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1535739221 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1535739221 +0000

Merge "Merge "Use tunnel local/remote addresses in security policies" am: 8424a78b75 am: f4c8a61ad7" into pi-dev-plus-aosp