Elliott Hughes ea1831d211 am b57dd722: resolved conflicts for a884d81e to stage-aosp-master
* commit 'b57dd722f1dc0663417da37d3a82f8283ad3c982':
  constify JNINativeMethod function pointer tables
2015-09-24 17:14:10 +00:00
..