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

Merge changes Ia14276d3,I7f063806
am: 1b2f6c36c7

Change-Id: Ib274eaefc1e46db03bca7dbe03bc6d99b30746eb
---

e1b3bd7ed3660da2e17029a2589f4831fe38062f