From: Jeff Hao <jeffhao@google.com>
Date: Tue, 22 Nov 2016 23:56:34 +0000 (+0000)
Subject: Merge changes from topic 'dex2oat_dexlayout'
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=176fc225aa0beb8312dc504e56ca01bafc7f783e;p=android-x86%2Fart.git

Merge changes from topic 'dex2oat_dexlayout'
am: f215c5255c

Change-Id: I3fbaa07cff742d3a30d9690c20b0cef0ce704e8e
---

176fc225aa0beb8312dc504e56ca01bafc7f783e