tree 1ee11245d13cd9b24e930f5c089fee2ea3e32127
parent 8b080d6e22dd1dedd5ef4f24614199d28bf6caf7
parent d207c7c8c29126f8266ce43f9d43123feb89a50d
author David Pursehouse <dpursehouse@collab.net> 1555033331 +0900
committer David Pursehouse <dpursehouse@collab.net> 1555033331 +0900

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  ResourceHelper: Simplify implementations

Change-Id: Idaa1de103bacdd6f565427d9788cff69a1313abd