tree f643667c491836bf19da1d1316796eb70932835f
parent bb23e198873a6e63c34b52fe3d1f12d3e5d13a2c
parent 062bd465cd25806ea37200639c6b1200a62db9d4
author Nick Kralevich <nnk@google.com> 1386355655 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1386355655 -0800

am 062bd465: Merge "jni: fix C99 inline linking"

* commit '062bd465cd25806ea37200639c6b1200a62db9d4':
  jni: fix C99 inline linking