From: Nicolas Geoffray <ngeoffray@google.com>
Date: Wed, 18 Jan 2017 16:17:01 +0000 (+0000)
Subject: Merge "Fix Mips build." am: 2ee01bff00 am: 37d922f1d8
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5b31f21917a99f8707cc8bdd838a02b927c137f2;p=android-x86%2Fart.git

Merge "Fix Mips build." am: 2ee01bff00 am: 37d922f1d8
am: baf5382870

Change-Id: Iacb55a60454943fe3a874f177b369739bf99bf28
---

5b31f21917a99f8707cc8bdd838a02b927c137f2