tree d768f670302a8232e84f3eae134d46ccdc49eb67
parent aabe5c345226f6bc9b96b8e6d3c75d4f154124a8
parent 6de41e5569f3778d2b0d4e38c563b52462a6f33e
author Jiyong Park <jiyong@google.com> 1518681758 +0000
committer android-build-merger <android-build-merger@google.com> 1518681758 +0000

Merge "Fix link-type warnings on espresso-* prebult libs" am: a871606145 am: aab1806c32
am: 6de41e5569

Change-Id: Iaa8627caea940e178c5c155c7f8af85aa1b6da03