tree f7b61d6aa9a826f248c3e5ffd2ba2408ed406c5a
parent 7222dbc0a07bbe0cb184aa68ee5d801bd8638108
parent 1413b254eb8f46ea0c8912a9e654826bb8137a89
author Sam Saccone <samccone@google.com> 1579379352 -0800
committer android-build-merger <android-build-merger@google.com> 1579379352 -0800

Merge "Revert "Annotate StringNetworkSpecifier @Deprecated and @removed""
am: 1413b254eb

Change-Id: I6f7ffbb68e8e87410009ad74e5019d24cab55ca1