tree 39fcbe6db6f065101074c98da8970a83d4df0d4b
parent 581097c616e56358025c5e76d1779308c620321f
parent 4d0cb4c0b8fca72d70f61c03f32c8a9bbdc2db75
author Stephen Hines <srhines@google.com> 1345750483 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1345750483 -0700

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

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