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