am 7f8c70a1: (-s ours) Merge "DO NOT MERGE - Fix improper declaration/use of pointer."
* commit '7f8c70a1a48df91ee5541b03dc380c08ab6ebf42': DO NOT MERGE - Fix improper declaration/use of pointer.
This commit is contained in: