OSDN Git Service

Merge "Add define needed by new vixl" am: 621a27ed21 am: 57de217dac
authorColin Cross <ccross@android.com>
Mon, 22 Aug 2016 20:35:01 +0000 (20:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 22 Aug 2016 20:35:01 +0000 (20:35 +0000)
am: 3ad6461077

Change-Id: Ie0ac8eb6605e1ccadb1b572c74fbbb0e5c6dcd21


Trivial merge