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

Merge "Stop hard coding gtest/gmock things." am: 9aef6c7d29 am: 37bbf91a24
am: 632565e26c

Change-Id: I7d33bbc218469ba70ce68cdca5571018a091fd45
---

4a85f36c2ec49308de29a017512fa25222c81eb7