| commit | 89ce394a8e6bcd2146453c1b07b5eecd7a941c69 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Mon Dec 11 22:57:43 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Dec 11 22:57:43 2023 +0000 |
| tree | ba1edda0f0f372704b91c221532ba260fa3bf047 | |
| parent | b487044be84671b15766ec1fd7a0a5f2fceb17cb [diff] | |
| parent | 8f33575cf4c00128c4c2e391b36a5cb269162d93 [diff] |
[automerger skipped] Merge Android 14 QPR1 am: 2ffa932ec6 -s ours am: 36eecfcb65 -s ours am: 8f33575cf4 -s ours am skip reason: Merged-In I93b2d84b45b078de9543a181876d53a8dd95b49e with SHA-1 98ed760a5d is already in history Original change: https://android-review.googlesource.com/c/platform/prebuilts/module_sdk/conscrypt/+/2863580 Change-Id: I41a2e8feca72b49a8936142427b6d96cade6306a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>