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