From: Dan Albert <danalbert@google.com>
Date: Fri, 12 Aug 2016 09:18:30 +0000 (+0000)
Subject: Merge "Stop hard coding gtest/gmock things."
X-Git-Tag: android-x86-8.1-r1~68^2~140^2^2~44
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=37bbf91a2464f680e11e1418e31458e60cb9537a;p=android-x86%2Fsystem-extras.git

Merge "Stop hard coding gtest/gmock things."
am: 9aef6c7d29

Change-Id: Ied120d80f30e9b81314ad13f6b32450f54f298fa
---

37bbf91a2464f680e11e1418e31458e60cb9537a