| commit | 37607dfca62fbe0e0b80db07ab19be1d24341361 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Fri May 05 21:10:11 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri May 05 21:10:11 2017 +0000 |
| tree | 465b7430655748714be63dd4bb18e2704f5adb38 | |
| parent | 0634c4f77f2640350665e3423a72e5c284df6c3e [diff] | |
| parent | c497348c7441598fc81aa12fd15ee3fd208fbe63 [diff] |
Merge changes from topic 'update-conscrypt' am: c497348c74 Change-Id: Ie3b9d74ff46be9e4b00c6efe6748feb5e096cd3a