tree c0391588d9905beb67dd0354f34e197c266e6a86
parent f1fba3e8fda9e8c6cee474936b445ebe609b879b
parent 8fc1f68512e126410c16a9b424a931ae0732a904
author Paul Hu <paulhu@google.com> 1541058375 -0700
committer android-build-merger <android-build-merger@google.com> 1541058375 -0700

Merge "Support backward compatibility for restricted network permission" am: dffb7d988c
am: 8fc1f68512

Change-Id: I9b2faf60ff007e2cc08dacd6988fe98377468e7e