OSDN Git Service

Merge changes from topic 'am-5af6dcdbe67049bb85b1929f4c3e828d' into oc-dev-plus-aosp
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Fri, 5 May 2017 21:41:16 +0000 (21:41 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 5 May 2017 21:41:22 +0000 (21:41 +0000)
* changes:
  Merge changes from topic 'update-conscrypt' am: c497348c74 am: 37607dfca6 am: 9172df0777
  Track updates to Conscrypt am: 7fdce769c3 am: 0634c4f77f am: 4fd0b06ac7


Trivial merge