| commit | 26c330a4248b79a14ac13c6ef30d522e4bba92d2 | [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 | 6e5317f11358559a997a9fd1d8495e75bd80a3b7 | |
| parent | 7724cffc30f49baad11636871f6970c6252dc6f1 [diff] | |
| parent | ccffea7a3d4ab33a1fed5648bb5926c65dea15b6 [diff] |
am ccffea7a: resolved conflicts for a884d81e to stage-aosp-master * commit 'ccffea7a3d4ab33a1fed5648bb5926c65dea15b6': constify JNINativeMethod function pointer tables