tree 06e5d8d8ba54422eed691eb9981eb916abb83ef8
parent aff8d7fac074e4604587bc9fbd48a29022de63c7
parent 06d2b2aaf090c2371d10643b2dc9c6efc2474359
author Marco Miller <marco.miller@ericsson.com> 1555014890 -0400
committer Marco Miller <marco.miller@ericsson.com> 1555014897 -0400

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  ResourceHelper: Simplify implementations

Change-Id: I4319b9fec0618b66c8c033f2febde25d21583ea3