am ae4cb17a: (-s ours) am 76aff1f6: Merge "Resource resolution bug fix. [DO NOT MERGE]" into klp-modular-dev
* commit 'ae4cb17a14d2a66961728d3cbd907cdba3f2f6d6': Resource resolution bug fix. [DO NOT MERGE]
This commit is contained in: