tree ef76987a2787f2891dfc5a555e1a5d784fe152c4
parent 0f502cb1b6af28234e918aea8078961abf4198ff
parent bb54baba0426819d6539aa47c48312440db4fb7e
author Erik Kline <ek@google.com> 1488894131 +0000
committer android-build-merger <android-build-merger@google.com> 1488894131 +0000

Merge "request{LinkProperties,NetworkCapabilities} no longer needed" am: 75dfc5bd91 am: 0f901af920
am: bb54baba04

Change-Id: Id2aa8aeff6d299edb85955c12ab0a04023458597