tree c79be9f010495b30625b881ed5a0af9963c0e8ee
parent b07e914d331e8146fef2c6b613f8bec4e6572fbf
parent d1a7c18ec6ccef28686b6cb7d1a994dbdf62eb9f
author Remi NGUYEN VAN <reminv@google.com> 1548945384 -0800
committer android-build-merger <android-build-merger@google.com> 1548945384 -0800

Merge "Add NetworkStackPermissionStub definitions" am: 0fe59007ce
am: d1a7c18ec6

Change-Id: I201c5a28b7f07178a6980e582d05b36121037707