tree 0db356813e1ee34a8004def41a46f70acd3c5bb2
parent 5bccd69318ea632cb75b9be07a989b529f9611e7
parent c72f456b199bd107ce81ccc9b99a18dd6909678e
author Chiachang Wang <chiachangwang@google.com> 1554863840 -0700
committer android-build-merger <android-build-merger@google.com> 1554863840 -0700

Merge "Enforce NETWORK_STACK permission for calling NSS#forceUpdateIfaces"
am: c72f456b19

Change-Id: Id5922a41d07c95958090f88a65d22ef5883aefff