From: Nicolas Geoffray <ngeoffray@google.com>
Date: Thu, 14 Jan 2016 13:08:55 +0000 (+0000)
Subject: Merge "Fix lint error."
X-Git-Tag: android-x86-7.1-r1~424^2~267^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f50d7ea29eda80fd405de7f665ea15eafde3dff5;p=android-x86%2Fart.git

Merge "Fix lint error."
---

f50d7ea29eda80fd405de7f665ea15eafde3dff5