OSDN Git Service

Merge changes from topic 'VIXLUpdate' am: 059802455e
authorNicolas Geoffray <ngeoffray@google.com>
Wed, 4 Jan 2017 10:11:53 +0000 (10:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 4 Jan 2017 10:11:53 +0000 (10:11 +0000)
am: 643d18982e

Change-Id: If999cac06e7acd60f6e53bf354ef3dc61fae7191


Trivial merge