| commit | 93f3a658ce9e18514552bf1e190603175bfa70f8 | [log] [tgz] |
|---|---|---|
| author | Adam Vartanian <flooey@google.com> | Thu Aug 01 07:25:16 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Aug 01 07:25:16 2019 -0700 |
| tree | 4a6614ead985d016bdbf042257172c6fc12d785c | |
| parent | 0891efdd452bbb4f496204aff8fe5e63000ca900 [diff] | |
| parent | 6b2a19ef2a5e41455085079db483b4042193f890 [diff] |
Merge "Update to support Conscrypt sync" am: 6b2a19ef2a Change-Id: I7d888438c7b8cd68923df0523b489d45afeb99aa