From: Jeff Hao <jeffhao@google.com>
Date: Thu, 1 Sep 2016 03:46:49 +0000 (+0000)
Subject: Merge "Disable dexlayout_test on target." am: 79c3e4e558 am: 29f5e12058
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c5a3b2b3822ad7c20bbb17de3cea9a64115f981b;p=android-x86%2Fart.git

Merge "Disable dexlayout_test on target." am: 79c3e4e558 am: 29f5e12058
am: 4f524c2563

Change-Id: I7b1de16c4af87b49a3b3f4406146ca5eee6e104d
---

c5a3b2b3822ad7c20bbb17de3cea9a64115f981b