commit | b98ee1eb50389520fd06255fd38b233c7adf5814 | [log] [tgz] |
---|---|---|
author | Craig Mautner <cmautner@google.com> | Mon Mar 24 14:38:33 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 24 14:38:33 2014 +0000 |
tree | f769cce4c3c61da74e7461779b5b4e98f2903e1c | |
parent | 3c34e5dbbb99d3d66f71eea5db6e001cc5495263 [diff] | |
parent | 103ed3558764f1fd41c9a5399e2030baa4110bfb [diff] |
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.