tree bc419b7c1933d6a2c56a8863faec3e4be3f4ec5d
parent d8c32164e19d16cf7d66b9aee368369ae16a4f0d
parent 557a93e104f1fec69ed05b2d0ff26c78bca4c5d6
author Craig Mautner <cmautner@google.com> 1395671699 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1395671699 -0700

am 557a93e1: Merge "Set ScreenshotSurface secure if any secure content is shown."

* commit '557a93e104f1fec69ed05b2d0ff26c78bca4c5d6':
  Set ScreenshotSurface secure if any secure content is shown.