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