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:
cc80f0a
9061b26
)
Merge "media: avoid NPE in CodecCapabilities.createFromProfileLevel" into nyc-dev
author
Lajos Molnar
<lajos@google.com>
Wed, 1 Jun 2016 23:44:12 +0000
(23:44 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 1 Jun 2016 23:44:12 +0000
(23:44 +0000)
am:
9061b26f1e
* commit '
9061b26f1ecba936f6f912398a9238c21dfa789c
':
media: avoid NPE in CodecCapabilities.createFromProfileLevel
Change-Id: I3cd969d6e686714cd7d9fa49eec70e9d810df36b
Trivial merge