OSDN Git Service

am 16580c9b: am 460bcb54: Merge "frameworks/base/docs: add jd files for NDK reference...
authorJohan Euphrosine <proppy@google.com>
Fri, 22 May 2015 15:27:01 +0000 (15:27 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 22 May 2015 15:27:01 +0000 (15:27 +0000)
* commit '16580c9bb4ef4cad1f5d59402a855189decb56ba':
  frameworks/base/docs: add jd files for NDK reference


Trivial merge