tree 339b569e9c4f8c617996a1846d4263b567096f4b
parent b9d54b3259361cd666902bd618c6c6fba00aa0e1
parent 0df67453b84d23b381e07e0d9c0d121b011ed0d2
author Kenny Root <kroot@google.com> 1402698419 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1402698419 +0000

am 0df67453: am bcc7c845: Merge changes I9abd00af,Id0e75f71

* commit '0df67453b84d23b381e07e0d9c0d121b011ed0d2':
  Upgrade to OpenSSL 1.0.1h
  Use numbering for patch orders