| commit | 434a481b2191562582c79be29f24c2e0b5ca60d0 | [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 | 497b04c0e570371917c2a30436081944b6ee7590 | |
| parent | ddb59c53c3357239d8f34c25e5c5c15ef6752f4b [diff] | |
| parent | ea1831d211ea0e6b2d161c714bb0786369ef2df5 [diff] |
am ea1831d2: am b57dd722: resolved conflicts for a884d81e to stage-aosp-master * commit 'ea1831d211ea0e6b2d161c714bb0786369ef2df5': constify JNINativeMethod function pointer tables