tree c3afe165fdc6db4dbd9bdc1dafa87d8a2f67a60f
parent 73018ee9e17fdf502a01d3a8430af0ce34543bc5
parent 417d65897d40e7eacaff3837a1392c5f85d34868
author Stephen Hines <srhines@google.com> 1345670672 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1345670672 -0700

am 417d6589: (-s ours) Merge "DO NOT MERGE - Cleanup pointer access in adapter and font."

* commit '417d65897d40e7eacaff3837a1392c5f85d34868':
  DO NOT MERGE - Cleanup pointer access in adapter and font.