tree 24b4d5f517c401df3ce21c5764e2b4ec91d7c4fb
parent 994dd0e96b489787878958812a527dec7c78028d
parent 8c96144cf009f6af2052106b7aa21ab5136154fc
author Dan Albert <danalbert@google.com> 1475008524 +0000
committer android-build-merger <android-build-merger@google.com> 1475008524 +0000

Merge "Add __ANDROID_API__ checks to NDK header." am: 3f3ab38ddc
am: 8c96144cf0

Change-Id: Ia2783fed1a2f79fa43db4592e3248d26342acaa6