tree 53a476c4085bc6f0cd270d72daedc4a32991860f
parent c9fad76673e721ac5d814fb3ea520941ce549d66
parent 2a4b62dd12240e7b21bec23615f59a3da41a3422
author Rubin Xu <rubinxu@google.com> 1505215735 +0000
committer android-build-merger <android-build-merger@google.com> 1505215735 +0000

Merge "Patch incoming LinkProperties before it's visible to the outside" am: 7b625191e2
am: 2a4b62dd12

Change-Id: I69700df358f8c5481d03b051163ba020e83c9fe4