tree 825eae667d1106b0b25cca7be6532ab1a4376b13
parent 658639c6bc43d06557be68f3b48d3263531b90e5
parent 678886fde5cd779de79f8e38479aa6de82f8e755
author Chris Craik <ccraik@android.com> 1402968676 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1402968676 +0000

am 678886fd: am b1fc06a4: am 5e7ef948: Merge "hwui: fix possible null pointer de-refrence"

* commit '678886fde5cd779de79f8e38479aa6de82f8e755':
  hwui: fix possible null pointer de-refrence