From: Andreas Gampe <agampe@google.com>
Date: Fri, 22 Jul 2016 00:03:12 +0000 (+0000)
Subject: Merge changes I295c7876,Ib4b84b7b
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7aee17199235348055deb89d07cdc8ea12adf189;p=android-x86%2Fart.git

Merge changes I295c7876,Ib4b84b7b
am: 84413a7617

Change-Id: I8b32598a46cb589cdefa1937ba4b9b69926f25b9
---

7aee17199235348055deb89d07cdc8ea12adf189