tree 3b5454e660b4e891f32f043406edca74f7843a80
parent be8fbb8fb63fddac2310dfbafa2594ed165b16b1
parent 7f8c70a1a48df91ee5541b03dc380c08ab6ebf42
author Stephen Hines <srhines@google.com> 1387413179 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1387413179 -0800

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.