tree 1147cb10e0e7993842ecde54b9081333c0a1083d
parent ebcc45df7737f571b0f55c9deebd299cbadd2e25
parent 686c5be4722dce02ae8e5580d6677f1eeea22464
author Dan Stoza <stoza@google.com> 1416341907 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1416341907 +0000

am 686c5be4: am 6b9454d1: SurfaceFlinger: Do less work when using PTS

* commit '686c5be4722dce02ae8e5580d6677f1eeea22464':
  SurfaceFlinger: Do less work when using PTS