From: Mathieu Chartier <mathieuc@google.com>
Date: Fri, 5 Feb 2016 22:17:12 +0000 (+0000)
Subject: Merge "Address missed amend"
X-Git-Tag: android-x86-7.1-r1~424^2^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f3c35954350ab3386cff538a123bc1b8e78e89f0;p=android-x86%2Fart.git

Merge "Address missed amend"
---

f3c35954350ab3386cff538a123bc1b8e78e89f0