Merge "Check NDK version in the app build script" am: 197032faf3
authorKalle Raita <kraita@google.com>
Mon, 6 Feb 2017 20:26:55 +0000 (20:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 6 Feb 2017 20:26:55 +0000 (20:26 +0000)
am: cf0f927df4

Change-Id: Ie9c979ff77c5edaea7d01fb510ef5ab140afeaa3


Trivial merge