tree 4cce042f2711461dc1c4b0e6d9ed9f7a3f219caa
parent aafb4b05764e9b888c5e2d7c2237cf95a06ca685
parent 63d998d8597abb9b0036caddea2798749a496609
author Remi NGUYEN VAN <reminv@google.com> 1554170042 -0700
committer android-build-merger <android-build-merger@google.com> 1554170042 -0700

Merge "Rename NetworkStackPermissionStub" am: 073e73a0c1
am: 63d998d859

Change-Id: Iffecb9d56fe90d9c62e963c2c38094f0c2b21f39