From: Colin Cross <ccross@android.com>
Date: Thu, 15 Sep 2016 21:55:08 +0000 (+0000)
Subject: Merge changes from topic 'art_tests' am: 7d26164308
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4c3ce12932da295de197391a48029dcd664751cd;p=android-x86%2Fart.git

Merge changes from topic 'art_tests' am: 7d26164308
am: 6ccebc29a6

Change-Id: Ib40f6e36e7de74d3f37ee8c305ebcfdd0c9caae4
---

4c3ce12932da295de197391a48029dcd664751cd