tree 2805d68e200efedb55cd48ef907b442f2ddf9214
parent 877f98dfb48635a05091716319d6971197136055
parent 59ef364a8888ce8ec05d55f9093536ecf6d43aa6
author Brian Carlstrom <bdc@google.com> 1362444967 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1362444967 +0000

am 59ef364a: Merge "Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding"

* commit '59ef364a8888ce8ec05d55f9093536ecf6d43aa6':
  Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding