OSDN Git Service

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

Change-Id: I8dfbd4b2bd7021e94ed2a98dac132214b2f2ab0d


Trivial merge