OSDN Git Service

am 5332706b: am b98ee1eb: am 103ed355: am 557a93e1: Merge "Set ScreenshotSurface...
authorCraig Mautner <cmautner@google.com>
Mon, 24 Mar 2014 21:25:37 +0000 (21:25 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 24 Mar 2014 21:25:37 +0000 (21:25 +0000)
commit452fd49369da80a460d43fcb7e71d8549268f378
treebc7cbde4fd399a1f78de8589f9c87c0bfcff1363
parent1c855178e497f7ba788dadb87167f1e6735d10cb
parent5332706b87c8772b97198e30c7cb4cc4ef3b577f
am 5332706b: am b98ee1eb: am 103ed355: am 557a93e1: Merge "Set ScreenshotSurface secure if any secure content is shown."

* commit '5332706b87c8772b97198e30c7cb4cc4ef3b577f':
  Set ScreenshotSurface secure if any secure content is shown.
services/core/java/com/android/server/wm/WindowManagerService.java