tag | 7e2de3b1bc936ad63ca5b205c6865455578e51be | |
---|---|---|
tagger | The Android Open Source Project <initial-contribution@android.com> | Fri Jan 28 23:13:16 2022 -0800 |
object | 9a7920f0a153409b59a2bb0a336a9f5f4886bbc5 |
Android Mainline 12.0.0 Release 25 (7557467,com.google.android.conscrypt)
commit | 9a7920f0a153409b59a2bb0a336a9f5f4886bbc5 | [log] [tgz] |
---|---|---|
author | Cassie Wang <cassiewang@google.com> | Mon Jul 12 21:17:01 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jul 12 21:17:01 2021 +0000 |
tree | 1218de299eea849acf24cd3bee1202f61ec58230 | |
parent | 447371245f88dbb8f567e976c4b7c81d03f50a5a [diff] | |
parent | ad02ac98de87d4588e849161ad28ece123325a15 [diff] |
Merge "Fix Reset() calls from crashing." into sc-dev am: ad02ac98de Original change: https://googleplex-android-review.googlesource.com/c/platform/external/icing/+/15225909 Change-Id: If05319c6c2e5afe8d7d03b1973cbfb60be2f817d