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

Merge changes Idfd8ac9f,I3dacb78f am: 244d105f68
am: 801d035a29

Change-Id: Ieccbf2646bc95a61dae9b4c27083ff6aa549174f
---

3e638a0e7dbfb7c389bd819f014c705a66a83112