commit | ee87b785a91858ca307a7116af21eb7dc3e6fdd7 | [log] [tgz] |
---|---|---|
author | Adam Vartanian <flooey@google.com> | Tue Jan 15 08:12:50 2019 -0800 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jan 15 08:12:50 2019 -0800 |
tree | 613d44e87e64d8b6800fad3564c1b5c35f1dd6f1 | |
parent | 4524abd3185db8f8d44f2075a05abf31c46b0f4d [diff] | |
parent | c586cdd9a97e7c77084d3c3481ef6102798b2685 [diff] |
Merge "Add APEX conscrypt.jar to Zygote whitelist" am: c586cdd9a9 Change-Id: I15eefa7aa087e19973f20c420a128537ed1c36ca