tree 5e03f690d34884838095cc9b8b106e532d74bbb8
parent fcf1689c1a1654cb3b480356a1ba3ebf198f2943
parent 3949f664c71ad1269ee0c921d176e3b4484015cc
author Dan Stoza <stoza@google.com> 1425924326 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1425924326 +0000

am 3949f664: Merge "SurfaceFlinger: Fix null pointer exception"

* commit '3949f664c71ad1269ee0c921d176e3b4484015cc':
  SurfaceFlinger: Fix null pointer exception