| commit | 244cc0c9c721089b79bff32b65ab17a9e0697137 | [log] [tgz] |
|---|---|---|
| author | Adam Vartanian <flooey@google.com> | Tue Jan 15 08:22:17 2019 -0800 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jan 15 08:22:17 2019 -0800 |
| tree | fb687a62467b5bf356650b9c7e2add3216439a29 | |
| parent | 0296c0cf2667724c5a41fd0bc2966b2db61c8979 [diff] | |
| parent | ee87b785a91858ca307a7116af21eb7dc3e6fdd7 [diff] |
Merge "Add APEX conscrypt.jar to Zygote whitelist" am: c586cdd9a9 am: ee87b785a9 Change-Id: I7bdee7b13ba8fbdb45f07fd12a75b4bffb469102