tree 30bf6964f6466e937b601be7b7158e0e43699484
parent 3490b1c2e45f72114d3ac78b35854573e2cbe6de
parent 3ee119cda4c2e1bdd978f96bfb0b761669d0a62d
author David 'Digit' Turner <digit@android.com> 1314202835 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1314202835 -0700

am 3ee119cd: Merge "ndk: update JNIEXPORT declaration in <jni.h>"

* commit '3ee119cda4c2e1bdd978f96bfb0b761669d0a62d':
  ndk: update JNIEXPORT declaration in <jni.h>