OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
05713dc
9967a4d
)
Merge "SurfaceTexture: setConsumerIsProtected" into oc-dev
author
Jiwen Cai
<jiwen@google.com>
Tue, 2 May 2017 16:04:26 +0000
(16:04 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 2 May 2017 16:04:26 +0000
(16:04 +0000)
am:
9967a4d3af
Change-Id: If2ec26782f82e0f22deb7d952b79436e30a91867
Trivial merge