Commits
Elliott Hughes authored and Android Git Automerger committed ea1831d211eM
am b57dd722: resolved conflicts for a884d81e to stage-aosp-master * commit 'b57dd722f1dc0663417da37d3a82f8283ad3c982': constify JNINativeMethod function pointer tables
Showing diff to64f6236cdd7