commit | 297ac9934478645fb8d241722a68652299fe50aa | [log] [tgz] |
---|---|---|
author | Anton Hansson <hansson@google.com> | Thu May 07 13:27:53 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu May 07 13:27:53 2020 +0000 |
tree | 2b8128c94d9255f68c7a09ee05be77fd27b4f6cd | |
parent | 5620ca2c13d1a83c2bc8474b03bd2cc4a0f6d2f3 [diff] | |
parent | 4963e51f974ca1fad8fde39f6c0e9e0676605fd8 [diff] |
Merge "Move conscrypt from the set of non-updatable APIs" into rvc-dev am: 4963e51f97 Change-Id: I357c3a312ecae5470703914ee237305068a0d56f