| commit | da1192ae311c3e02202ed1960e4076352ecb45c9 | [log] [tgz] |
|---|---|---|
| author | Tim Murray <timmurray@google.com> | Mon Feb 03 23:19:34 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Feb 03 23:19:34 2014 +0000 |
| tree | 8902bb9d3c16a6452b957b91a263e17c77c198d6 | |
| parent | 7d02a5fcb73e56a6751642d914cc0bfca5143aae [diff] | |
| parent | 47f295e8cb26991fe4b1d5f0a218222a0728d9a2 [diff] |
am 47f295e8: (-s ours) am 8df3ea66: am b4cf2a2a: Merge "Convert Java/JNI to 64-bit, part 2." * commit '47f295e8cb26991fe4b1d5f0a218222a0728d9a2': Convert Java/JNI to 64-bit, part 2.