commit | f1246180a553a20675a9f3c2ad05118de86e739a | [log] [tgz] |
---|---|---|
author | Neil Fuller <nfuller@google.com> | Mon Oct 15 13:48:54 2018 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Mon Oct 15 13:48:54 2018 -0700 |
tree | 74e151fadbc41c529d41305629e1ccb8f2c301e8 | |
parent | 0ff021aa7c4746ed81f1b5f3a31c5f75eee07031 [diff] | |
parent | 03bcf21fafed55bfa02e3ceb9f291586df0d6592 [diff] |
Merge "Remove explicit dependencies on conscrypt" am: ca980ac83c am: 2462e2de0c am: 03bcf21faf Change-Id: Ie075359bbb965c524d3d20b31c8efdb38884322a