tree 1feee6ab00c3c745495521f39f4ac7603c2ed181
parent cbfd5fe3eca597dfce583fe32e14778bbc4159c6
parent ab9a7ce185eb0e545c13100f0ae8a5cac6947a71
author swift-ci <swift-ci@users.noreply.github.com> 1478964825 -0800
committer swift-ci <swift-ci@users.noreply.github.com> 1478964825 -0800

Merge remote-tracking branch 'origin/swift-3.1-branch' into stable

* origin/swift-3.1-branch:
  [API Notes] Enable support for overriding the types of declarations.
  [API Notes] Add support for expressing the types of entities.