tree c8ade0eb477ca7a2ac3c992218c171a4abe95ea2
parent 94d5ac480286d5e4d856bb968263e6991a62002d
parent 105aa28eeff9d31eebc7645aecb7630918a09b2a
author Dan Stoza <stoza@google.com> 1426002535 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426002535 +0000

am 105aa28e: am b275b4dc: am 3949f664: Merge "SurfaceFlinger: Fix null pointer exception"

* commit '105aa28eeff9d31eebc7645aecb7630918a09b2a':
  SurfaceFlinger: Fix null pointer exception