| commit | a5170da8be5c557651f811f3bbe9356f97412713 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Fri May 05 21:42:03 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri May 05 21:42:03 2017 +0000 |
| tree | 43d843456900063ed667765ac7ed15ade9a62feb | |
| parent | b25c6766428b75fe067c11d8dcffd87f390811e0 [diff] | |
| parent | 56014efbfd723081f18c4cebe34af20a10ba15f7 [diff] |
Merge "Merge changes from topic 'update-conscrypt' am: c497348c74" into stage-aosp-master am: da0363104c am: 56014efbfd Change-Id: I4576ade698e72dd1c5731a4cff92f1c36cdb6f05