| commit | 7ee4aba226b85236b8b21d4311cc18471c72b936 | [log] [tgz] |
|---|---|---|
| author | Jamie Gennis <jgennis@google.com> | Mon Oct 22 13:57:51 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 22 13:57:51 2012 -0700 |
| tree | 2c0a13e8862ff0b8afe712693228320479b0f0cf | |
| parent | 42371e5e633405d547660c9696be0b77aecf25b2 [diff] | |
| parent | 3b6055a7184a2da7bbdd94118a8c6af875bb28b1 [diff] |
am 3b6055a7: am ba7dc2db: Merge "SurfaceFlinger: add support for secure displays" into jb-mr1-dev * commit '3b6055a7184a2da7bbdd94118a8c6af875bb28b1': SurfaceFlinger: add support for secure displays