Google Git
Sign in
android / platform / external / chromium_org / third_party / openssl / c2a9402712e13e15fcae2b17ec0cbecb816ef52e
commitc2a9402712e13e15fcae2b17ec0cbecb816ef52e[log] [tgz]
authorBen Murdoch <benm@google.com>Sun Jul 20 18:26:46 2014 -0700
committerBen Murdoch <benm@google.com>Sun Jul 20 18:26:46 2014 -0700
tree481884e6fdb9d39ed6065a0069750a490081d773
parent56aeae9b065578e56222618886ef0e42488397e2 [diff]
parent9e21ded33babccff0488621e3a7261175a289f4b [diff]
Merge from Chromium at DEPS revision 284076

This commit was generated by merge_to_master.py.

Change-Id: Id679bcc6d6917ac7d763985319eb580c796ef5c9
tree: 481884e6fdb9d39ed6065a0069750a490081d773
  1. config/
  2. openssl/
  3. patches.chromium/
  4. BUILD.gn
  5. buildinf.h
  6. import_from_android.sh
  7. openssl-chromium.config
  8. openssl.gyp
  9. openssl.gypi
  10. openssl.target.darwin-arm.mk
  11. openssl.target.darwin-arm64.mk
  12. openssl.target.darwin-mips.mk
  13. openssl.target.darwin-x86.mk
  14. openssl.target.darwin-x86_64.mk
  15. openssl.target.linux-arm.mk
  16. openssl.target.linux-arm64.mk
  17. openssl.target.linux-mips.mk
  18. openssl.target.linux-x86.mk
  19. openssl.target.linux-x86_64.mk
  20. openssl_nacl.gyp
  21. OWNERS
  22. README.chromium