| commit | bd2d5f7e37a9d4fba09b2e3df0d891af1f192247 | [log] [tgz] |
|---|---|---|
| author | Adam Vartanian <flooey@google.com> | Mon Sep 17 07:45:30 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Sep 17 07:45:30 2018 -0700 |
| tree | 148a801fd5a75b331516231c766eec0bf439ee0a | |
| parent | 9cfb9ce7f8073346b4f58439f3f34da3db7d5fff [diff] | |
| parent | d6157530e04ead38216ec64edacde66c60b4d717 [diff] |
Merge "Merge "Update greylist for Conscrypt update" am: 27eec4b376 am: b4c55fac9a" into pi-dev-plus-aosp am: d6157530e0 Change-Id: Ic140d582af2f5c2baa3bff6ceb0654baccd8e27a