tree 386fbb85a55f99dc9c08d86a923072bb5e2d0f74
parent 45765ca6f43ceede82a4a953d37c3511e1428d57
parent 6e7d2ba8095c7c312013ff450dc8396135853e60
author Johan Euphrosine <proppy@google.com> 1432318245 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1432318245 +0000

am 6e7d2ba8: am fe6d855c: am 16580c9b: am 460bcb54: Merge "frameworks/base/docs: add jd files for NDK reference" into lmp-docs

* commit '6e7d2ba8095c7c312013ff450dc8396135853e60':
  frameworks/base/docs: add jd files for NDK reference