tree aeb1718593854c711147091e059237c758451a0e
parent e22e268e6d158f37173b1bce37a5614daabcf18c
parent 7a629fac82f88126642081b4474879f6a883e313
author Tim Murray <timmurray@google.com> 1391467005 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1391467005 +0000

Merge "Convert Java/JNI to 64-bit, part 2."