tree 6c984ff9673662bc020a130a439b64c2b7928f76
parent 620685c2e684082c82657732d1e35cefd0c79006
parent dd3cb84cfbe8068790c6233b5829fae9c4a0ee93
author Jamie Gennis <jgennis@google.com> 1350939018 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1350939019 -0700

Merge "SurfaceFlinger: add support for secure displays" into jb-mr1-dev