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

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

Change-Id: Ia198ebf8f282a3e893e56c5001f5844a39ccd1c3
---

4f524c2563c6d7d921eb56b38658cdb5ec7de68e