tree 720eb2dfce15a3779fdfcb6bdf68195edd921e0e
parent ffbb56d67ac4b9ac40ff9a7e55de0a4842d7bade
parent 89224466a6c38d498f3794bca8ed3cd7ca1887e0
author Dan Albert <danalbert@google.com> 1507840892 +0000
committer android-build-merger <android-build-merger@google.com> 1507840892 +0000

Merge "Don't hide NDK types behind API level guards." am: 37dc3d2136 am: 23ac59ad8d am: d32aab8c29
am: 89224466a6

Change-Id: I32760fae1179927e7f2772f50c44cbfc9fb24466