OSDN Git Service

Merge "Fix Mips build." am: 2ee01bff00 am: 37d922f1d8
authorNicolas Geoffray <ngeoffray@google.com>
Wed, 18 Jan 2017 16:17:01 +0000 (16:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 18 Jan 2017 16:17:01 +0000 (16:17 +0000)
am: baf5382870

Change-Id: Iacb55a60454943fe3a874f177b369739bf99bf28


Trivial merge