tree 23b314c69ccef8e3f34923a269e60ea84d5696dc
parent b4d662dc0acaa1c7b00fe278222d1acfb4e5695f
parent a99f0b6e386f71ecfb8aca429693b4b44e346be4
author Elliott Hughes <enh@google.com> 1386883840 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1386883840 +0000

am a99f0b6e: am 5b8daae0: am a67b39cb: Merge "Pixelflinger: Fix issue of pointers being stored in ints"

* commit 'a99f0b6e386f71ecfb8aca429693b4b44e346be4':
  Pixelflinger: Fix issue of pointers being stored in ints