tree 24b4d5f517c401df3ce21c5764e2b4ec91d7c4fb
parent 5b9554ace248e24b61c94596aedda4b8f9d1d674
parent 3f3ab38ddcc483596182b945b8d1482bf36e5f3d
author Dan Albert <danalbert@google.com> 1475008343 +0000
committer android-build-merger <android-build-merger@google.com> 1475008343 +0000

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

Change-Id: I0d96d8f0f2d505360dac3e30c95c599a895d0f5c