From: Jeff Hao <jeffhao@google.com>
Date: Wed, 31 Aug 2016 20:15:47 +0000 (+0000)
Subject: Merge changes Idfd8ac9f,I3dacb78f
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=801d035a29bf9e7df87b091ee3eb8b1d39c1450f;p=android-x86%2Fart.git

Merge changes Idfd8ac9f,I3dacb78f
am: 244d105f68

Change-Id: I3e3dfd52a6aa687cf7a18997448e7d25bc6a57ff
---

801d035a29bf9e7df87b091ee3eb8b1d39c1450f