OSDN Git Service

am 103ed355: am 557a93e1: Merge "Set ScreenshotSurface secure if any secure content...
authorCraig Mautner <cmautner@google.com>
Mon, 24 Mar 2014 14:38:33 +0000 (14:38 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 24 Mar 2014 14:38:33 +0000 (14:38 +0000)
commitb98ee1eb50389520fd06255fd38b233c7adf5814
treef769cce4c3c61da74e7461779b5b4e98f2903e1c
parent3c34e5dbbb99d3d66f71eea5db6e001cc5495263
parent103ed3558764f1fd41c9a5399e2030baa4110bfb
am 103ed355: am 557a93e1: Merge "Set ScreenshotSurface secure if any secure content is shown."

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