| commit | a98eb45c283fb503d1139fc004898eb0b717e2f7 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Fri May 05 21:16:47 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri May 05 21:16:47 2017 +0000 |
| tree | 465b7430655748714be63dd4bb18e2704f5adb38 | |
| parent | 94f4f5e45f236d5be1816cc6cd61c2be94b30c55 [diff] | |
| parent | c497348c7441598fc81aa12fd15ee3fd208fbe63 [diff] |
Merge changes from topic 'update-conscrypt' am: c497348c74 Change-Id: Ifa261c6c003f3e0ca767356bc98c2c3033bd699a