| commit | 76da1723bc18f8eedba98cf3d96525ff79e7ebe7 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Fri May 05 21:33:39 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri May 05 21:33:39 2017 +0000 |
| tree | 43d843456900063ed667765ac7ed15ade9a62feb | |
| parent | 7df412a6bf8f63db456617d92861202dfefc6c48 [diff] | |
| parent | 9172df07775fc4cae9cd70b14310703d763cc0db [diff] |
Merge changes from topic 'update-conscrypt' am: c497348c74 am: 37607dfca6 am: 9172df0777 Change-Id: I78b96e5ae3231185a1b26e2e8b9f95881c279de0