| commit | 9172df07775fc4cae9cd70b14310703d763cc0db | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Fri May 05 21:19:11 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri May 05 21:19:11 2017 +0000 |
| tree | 3236f8829b573d27e3e64c84a12b4c8522e2cfab | |
| parent | 4fd0b06ac7d5304c7d93dcfc89778a1b2654f900 [diff] | |
| parent | 37607dfca62fbe0e0b80db07ab19be1d24341361 [diff] |
Merge changes from topic 'update-conscrypt' am: c497348c74 am: 37607dfca6 Change-Id: Iaa67f9512dd0447487b42d655c03c3c445068837