| commit | 998a1baa9ca2d0e78cfc2f0b707cfed170b02830 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Sep 24 17:23:00 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 24 17:23:00 2015 +0000 |
| tree | 83b57d1ac48029c220f6733746f0bfb7825ea86d | |
| parent | 0467b8e6372c71b97cddfc3ac591d947a5050e9f [diff] | |
| parent | 26c330a4248b79a14ac13c6ef30d522e4bba92d2 [diff] |
am 26c330a4: am ccffea7a: resolved conflicts for a884d81e to stage-aosp-master * commit '26c330a4248b79a14ac13c6ef30d522e4bba92d2': constify JNINativeMethod function pointer tables