| commit | e12dacbd690b206721cd9b47d9ec8ab1e8879b4c | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | Tue Jan 15 16:33:26 2019 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Jan 15 16:33:26 2019 +0000 |
| tree | 4e8c0a012aa87cae8ecf30de81a90c657ea5b2be | |
| parent | 0736f6ec51717dcfb50786a20f4942ca78d73414 [diff] | |
| parent | ca8cfacc4c6d8090c4fee5a3ff74421b27c495a8 [diff] |
Merge "Merge "Add APEX conscrypt.jar to Zygote whitelist" am: c586cdd9a9 am: ee87b785a9 am: 244cc0c9c7"