From: Andreas Gampe <agampe@google.com>
Date: Fri, 20 Jan 2017 17:09:14 +0000 (+0000)
Subject: Merge changes I914dfac9,I33b1934a
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6e820fe940;p=android-x86%2Fart.git

Merge changes I914dfac9,I33b1934a
am: 7709f7bec8

Change-Id: I85cd1c69a758bda81420849144d0b0fe2d7d2411
---

6e820fe940506c14bd9e3364ca1608a636d4dfac