tree 065dcb683d14cd0afa29b58e7a8698d0b24bd911
parent 46887e58fb2181cbedd0e21451d2f41ac7bdc8eb
parent 79489fa5426f98c14c41bc56eb4311edeb26210c
author Lorenzo Colitti <lorenzo@google.com> 1548140400 -0800
committer android-build-merger <android-build-merger@google.com> 1548140400 -0800

Merge "Properly expect all callbacks in testStackedLinkProperties." am: a1b2a93273 am: 2f4c32bc50
am: 79489fa542

Change-Id: I615f412f7696752d867337ab5cbabe24daea2ed3