From: Mingyao Yang <mingyao@google.com>
Date: Wed, 19 Apr 2017 18:05:20 +0000 (+0000)
Subject: Merge "Fix CHA test failures under some configurations." am: 59715029ae
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6ab42f58cbedf4a262bbb6ace84b772c180fe7e0;p=android-x86%2Fart.git

Merge "Fix CHA test failures under some configurations." am: 59715029ae
am: 2566578b70

Change-Id: I73941a7f22d70380a7239c78e1f6628e0d456470
---

6ab42f58cbedf4a262bbb6ace84b772c180fe7e0