diff options
| author | Elliott Hughes <enh@google.com> | 2015-09-24 17:14:10 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-24 17:14:10 +0000 |
| commit | ea1831d211ea0e6b2d161c714bb0786369ef2df5 (patch) | |
| tree | 93d75123104d31929170fb55701cbe4666eaf47c /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 64f6236cdd76c4539fea9c8fb19b2f0c981a01d3 (diff) | |
| parent | b57dd722f1dc0663417da37d3a82f8283ad3c982 (diff) | |
am b57dd722: resolved conflicts for a884d81e to stage-aosp-master
* commit 'b57dd722f1dc0663417da37d3a82f8283ad3c982':
constify JNINativeMethod function pointer tables
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions