| commit | ecf2452cb559ca6e33522681c1d771854ac98962 | [log] [tgz] |
|---|---|---|
| author | Adam Vartanian <flooey@google.com> | Mon Sep 17 07:13:42 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Sep 17 07:13:42 2018 -0700 |
| tree | 4d4e733551cab9eaea9b5a32c9c7ec2a6e688ca9 | |
| parent | 2f5d2a50a84c7d6b828a0118c80468d5696f46b3 [diff] | |
| parent | b4c55fac9a109874169e4a5fb883f3f884fd2052 [diff] |
Merge "Update greylist for Conscrypt update" am: 27eec4b376 am: b4c55fac9a Change-Id: I06386d4ee798b7aac96f9ff3bbe61e98482baaae