| commit | 452fd49369da80a460d43fcb7e71d8549268f378 | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Mon Mar 24 21:25:37 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 24 21:25:37 2014 +0000 |
| tree | bc7cbde4fd399a1f78de8589f9c87c0bfcff1363 | |
| parent | 1c855178e497f7ba788dadb87167f1e6735d10cb [diff] | |
| parent | 5332706b87c8772b97198e30c7cb4cc4ef3b577f [diff] |
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.