| commit | 56014efbfd723081f18c4cebe34af20a10ba15f7 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Fri May 05 21:25:56 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri May 05 21:25:56 2017 +0000 |
| tree | 3236f8829b573d27e3e64c84a12b4c8522e2cfab | |
| parent | 9172df07775fc4cae9cd70b14310703d763cc0db [diff] | |
| parent | da0363104ca03ac9da5fe830697ce8d04745748a [diff] |
Merge "Merge changes from topic 'update-conscrypt' am: c497348c74" into stage-aosp-master am: da0363104c Change-Id: I2fd2dc2d580de6423111de1674b3999d87542878