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:
dd1cca6
abf54a6
)
Merge "Fix for MediaPlayerStreamingStressTest/HLS" into oc-dev am: a72902a079
author
Hassan Shojania
<shojania@google.com>
Fri, 21 Apr 2017 21:55:05 +0000
(21:55 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 21 Apr 2017 21:55:05 +0000
(21:55 +0000)
am:
abf54a61bc
Change-Id: I1b5e5717811398e6f2b7b2c1edd6008cdf75754d
Trivial merge