| commit | ca8cfacc4c6d8090c4fee5a3ff74421b27c495a8 | [log] [tgz] |
|---|---|---|
| author | Adam Vartanian <flooey@google.com> | Tue Jan 15 08:32:34 2019 -0800 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jan 15 08:32:34 2019 -0800 |
| tree | c778b2c8504a70af81e8ce42e157f96bf2d8a36a | |
| parent | d08f18b455beb9cd981369df0561b54c74482e54 [diff] | |
| parent | 244cc0c9c721089b79bff32b65ab17a9e0697137 [diff] |
Merge "Add APEX conscrypt.jar to Zygote whitelist" am: c586cdd9a9 am: ee87b785a9 am: 244cc0c9c7 Change-Id: I5f5d81ee77a19be699dcb46f3aaa4a4a060095ab