| commit | 627c4d870c07e474c833d019231df7a2227a665b | [log] [tgz] |
|---|---|---|
| author | Vladimir Marko <vmarko@google.com> | Tue Dec 18 11:00:12 2018 -0800 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Dec 18 11:00:12 2018 -0800 |
| tree | 9adacb61d99cd3ce48093ec99d667b0843d5dc84 | |
| parent | f48cd457cc00ba8d71f8f528b63b06cba54f9aff [diff] | |
| parent | 709e58853ed88056520fae85b7cc6a5c1f878419 [diff] |
Merge "Move conscrypt back to core image to unblock Golem." am: 709e58853e Change-Id: I211663da7f89671ef1ae479ec27d96285e17b44d