tree 7344dedb6f0bbc403d6c884f4413eb9d9fe73b66
parent a564df698a63ac0f5eb6d40c9ea39767745497be
parent 6c8acb9a9effb78144d5a25f10a6c887afe1e7ce
author David Pursehouse <dpursehouse@collab.net> 1536795317 +0900
committer David Pursehouse <dpursehouse@collab.net> 1536795317 +0900

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  license-map: Fix deprecation warning

Change-Id: I844ac0ad51067e84cde747c72b35f2b2980e501a