From: Richard Uhler <ruhler@google.com>
Date: Tue, 19 Apr 2016 16:34:15 +0000 (+0000)
Subject: Merge changes Ia55ae13e,Ib3e2e6d2 into nyc-dev
X-Git-Tag: android-x86-7.1-r1~221
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c70ba008834e8d7de456eaa09bc27e506121a495;p=android-x86%2Fart.git

Merge changes Ia55ae13e,Ib3e2e6d2 into nyc-dev
am: 0fca5f7

* commit '0fca5f75f56f59d68fc6d3a891302efbebd621da':
  Disable stripped-dex test for no-dex2oat.
  Disable stripped-dex test on target.

Change-Id: I82e0183b451dae790a81ee1c200efd777928b082
---

c70ba008834e8d7de456eaa09bc27e506121a495