tree 8376117ede1f2870cec7de812f09ded53a28bd06
parent 042ceb35cb2af977e5d201413de7b7197ea0e515
parent 43be13a7c7968ba079c87fed7143ec4b6c642b2e
author Brian Carlstrom <bdc@google.com> 1362444961 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1362444961 +0000

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

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