OSDN Git Service
(root)
/
android-x86
/
frameworks-native.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
44c985e
ba7dc2d
)
am ba7dc2db: Merge "SurfaceFlinger: add support for secure displays" into jb-mr1-dev
author
Jamie Gennis
<jgennis@google.com>
Mon, 22 Oct 2012 20:54:50 +0000
(13:54 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Mon, 22 Oct 2012 20:54:50 +0000
(13:54 -0700)
* commit '
ba7dc2db6e93a2407c8c328f2838591b7b760658
':
SurfaceFlinger: add support for secure displays
Trivial merge