tree 4aba39348273730bfdcf2229e542f0e37b7c31cf
parent b1d46b55398885f2ed8442fff842119f2b30f72a
parent 1379ea50e15cf62650aba59fe78c6800746352fc
author Jiyong Park <jiyong@google.com> 1521107529 +0000
committer android-build-merger <android-build-merger@google.com> 1521107529 +0000

Merge "Fix link-type errors on some tests" am: 132ee4413d am: 1c6a18e6ed  -s ours
am: 1379ea50e1  -s ours

Change-Id: Ie7531a20356e3234a41d4c868c371b4d5aa05707