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:
a47967b
47effff
)
Merge \\"MediaDataSource: add DrmInitialization for IDataSource.\\" into nyc-mr1...
author
Wei Jia
<wjia@google.com>
Wed, 13 Jul 2016 02:15:42 +0000
(
02:15
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 13 Jul 2016 02:15:42 +0000
(
02:15
+0000)
am:
47efffff85
Change-Id: I49c99beced2fefd0dd9f1ce8e7365e60c0834a7e
Trivial merge