tree e58d588573696ebcd95120e43d60959a0666fd13
parent e2cb7202c98bb1f289573ce05a55035c1f5ef054
parent 19159dbc9507873b465914a9c62d4dd71f0e24ef
author Chalard Jean <jchalard@google.com> 1549443252 -0800
committer android-build-merger <android-build-merger@google.com> 1549443252 -0800

Merge "Deprecate getActiveLinkProperties." am: 4b7cae6c0d
am: 19159dbc95

Change-Id: Iab302f94c8b33373831e1aa2aa4ff2beac9cf82f