Commit 34b193b5 authored by Haibo Huang's avatar Haibo Huang Committed by android-build-merger
Browse files

Merge "Be compatible with new google test" am: f4d63fe4 am: 6cf44788 

am: 74479e7a

Change-Id: Ib2227034fe47817198f4c2bbae4630aaf7b05413
parents 5a1d875c 74479e7a
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment