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)
am: da0363104c

Change-Id: I2fd2dc2d580de6423111de1674b3999d87542878


Trivial merge