diff options
author | Torne (Richard Coles) <torne@google.com> | 2014-08-12 13:48:36 +0100 |
---|---|---|
committer | Torne (Richard Coles) <torne@google.com> | 2014-08-12 13:48:36 +0100 |
commit | ed633b360b6f73b0c70f1c08a92ca26d72f357be (patch) | |
tree | 5519f82be789be02f6b137cd36f4c94dc370804c /openssl.gypi | |
parent | c2a9402712e13e15fcae2b17ec0cbecb816ef52e (diff) | |
parent | a197510eb4dfce8e8294f0bc041e352729bd2dd7 (diff) | |
download | openssl-ed633b360b6f73b0c70f1c08a92ca26d72f357be.tar.gz |
Merge from Chromium at DEPS revision 288042
This commit was generated by merge_to_master.py.
Change-Id: Ic56ac0ad483d730efeb75b1f3b338ac16a79923d
Diffstat (limited to 'openssl.gypi')
0 files changed, 0 insertions, 0 deletions