tree 311c2eb731af8617fc8ce1d37c5b27efc255485b
parent f11b58f296039a0bf90336e4c38c014f11542092
parent b275b4dc3e5dcbae1e171bd51165a93f16332ef4
author Dan Stoza <stoza@google.com> 1425924557 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1425924557 +0000

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

* commit 'b275b4dc3e5dcbae1e171bd51165a93f16332ef4':
  SurfaceFlinger: Fix null pointer exception