Commit 6cf44788 authored by Haibo Huang's avatar Haibo Huang Committed by android-build-merger
Browse files

Merge "Be compatible with new google test" 

am: f4d63fe4

Change-Id: Id063c973159364738a7fb6f17a6c8838c4756b9d
parents 70564d57 f4d63fe4
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