OSDN Git Service

Merge "Merge changes from topic 'update-conscrypt' am: c497348c74" into stage-aosp...
authorKenny Root <kroot@google.com>
Fri, 5 May 2017 21:25:56 +0000 (21:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 5 May 2017 21:25:56 +0000 (21:25 +0000)
commit56014efbfd723081f18c4cebe34af20a10ba15f7
tree3236f8829b573d27e3e64c84a12b4c8522e2cfab
parent9172df07775fc4cae9cd70b14310703d763cc0db
parentda0363104ca03ac9da5fe830697ce8d04745748a
Merge "Merge changes from topic 'update-conscrypt' am: c497348c74" into stage-aosp-master
am: da0363104c

Change-Id: I2fd2dc2d580de6423111de1674b3999d87542878