diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-07 15:49:42 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-07 15:49:42 +0000 |
| commit | b02ac1269dac2e61bc616050542f1e3ab22ef918 (patch) | |
| tree | 404c2e3870a524f88aa3a556a5a6b65da4655984 /docs/html/sdk/api_diff/22/changes | |
| parent | 5d3555b9068f83f19b4cd27d9e0f653aca43d54b (diff) | |
| parent | ba8ff6f5790c7b71e1289c2b4e41e124eaf557c5 (diff) | |
Merge "[automerger skipped] Merge "Move conscrypt from the set of non-updatable APIs" am: d28224cf8a am: b09d7cfb73 -s ours am: f3eb744d89 -s ours am: 9750d877b4 -s ours" into rvc-qpr-dev-plus-aosp am: ba8ff6f579 -s ours
am skip reason: Change-Id Iacfcc3a789cb42a73cc4b4c89a215db0ea09800f with SHA-1 e89d37d6d8 is in history
Change-Id: I157d36641740981e0c3851fb7fdf860fa2e54b7c
Diffstat (limited to 'docs/html/sdk/api_diff/22/changes')
0 files changed, 0 insertions, 0 deletions