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:
82a188f
e3348a2
)
Merge "MediaCodec.CryptoInfo: expose subsample encryption pattern" into pi-dev
author
Robert Shih
<robertshih@google.com>
Wed, 30 May 2018 18:13:45 +0000
(11:13 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 30 May 2018 18:13:45 +0000
(11:13 -0700)
am:
e3348a2593
Change-Id: I6eaaabc353304ee29aa677bf03d94384ddede51c
Trivial merge