| commit | ea1831d211ea0e6b2d161c714bb0786369ef2df5 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Sep 24 17:14:10 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 24 17:14:10 2015 +0000 |
| tree | 93d75123104d31929170fb55701cbe4666eaf47c | |
| parent | 64f6236cdd76c4539fea9c8fb19b2f0c981a01d3 [diff] | |
| parent | b57dd722f1dc0663417da37d3a82f8283ad3c982 [diff] |
am b57dd722: resolved conflicts for a884d81e to stage-aosp-master * commit 'b57dd722f1dc0663417da37d3a82f8283ad3c982': constify JNINativeMethod function pointer tables