| commit | 5332706b87c8772b97198e30c7cb4cc4ef3b577f | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Mon Mar 24 14:44:17 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 24 14:44:17 2014 +0000 |
| tree | e1ee688dbbed4ba2ad0b6881a12569b07dafeb8b | |
| parent | 775a097f01a349548d2124ae9d7dd562c72eaa27 [diff] | |
| parent | b98ee1eb50389520fd06255fd38b233c7adf5814 [diff] |
am b98ee1eb: am 103ed355: am 557a93e1: Merge "Set ScreenshotSurface secure if any secure content is shown." * commit 'b98ee1eb50389520fd06255fd38b233c7adf5814': Set ScreenshotSurface secure if any secure content is shown.