From: Nicolas Geoffray <ngeoffray@google.com>
Date: Sat, 17 Sep 2016 13:48:19 +0000 (+0000)
Subject: Merge "Fix 2ND arch gtest testing." am: 8d0e6c5c18
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=cf0b6b81e8348e0c003d7c2d4cee937b62163aa3;p=android-x86%2Fart.git

Merge "Fix 2ND arch gtest testing." am: 8d0e6c5c18
am: c2900a01c4

Change-Id: I4ada5618ec797fc728cd8e5984a2587ce6ea7b6c
---

cf0b6b81e8348e0c003d7c2d4cee937b62163aa3