commit | b82d50e7c156943a494a2c16b1a311db43bbf896 | [log] [tgz] |
---|---|---|
author | Android Chromium Automerger <chromium-automerger@android> | Fri Jul 18 03:11:29 2014 +0000 |
committer | Android Chromium Automerger <chromium-automerger@android> | Fri Jul 18 03:11:29 2014 +0000 |
tree | ed12da495bd076a1c8532d7e051393aa343f2357 | |
parent | 42f9dffd4ef4e9a010f286ced7d80079ba0750a6 [diff] | |
parent | 662d81de5cbf3667f1baaafe051b8b4ab0b12fe2 [diff] |
Merge third_party/libsrtp from https://chromium.googlesource.com/chromium/deps/libsrtp.git at 662d81de5cbf3667f1baaafe051b8b4ab0b12fe2 This commit was generated by merge_from_chromium.py. Change-Id: I228102856110fba75530b2ffa9e463acb75967d2