diff options
| author | Yan Yan <evitayan@google.com> | 2020-10-16 22:30:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-10-16 22:30:37 +0000 |
| commit | a80fb3bbe66c92460c867a88b0ca5d0cfd354b40 (patch) | |
| tree | a2555b35ae62ad52ef550dee5402210007f26be5 /telecomm/java/android/telecom/Conference.java | |
| parent | 1e19124f422c9bda3eb50c70448133b9d70487e6 (diff) | |
| parent | b766701fa4323e7c158547d205df78ce5396c02f (diff) | |
Merge changes from topic "new-ipsec-api"
* changes:
Expose new algorithms as public API
Add new mandatory IPsec algorithms
Diffstat (limited to 'telecomm/java/android/telecom/Conference.java')
0 files changed, 0 insertions, 0 deletions