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:
044a2e7
97d579d
)
Merge "MediaPlayer2: clarify sync/async for API's" into pi-dev
author
Wei Jia
<wjia@google.com>
Tue, 6 Mar 2018 08:07:34 +0000
(08:07 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 6 Mar 2018 08:07:34 +0000
(08:07 +0000)
am:
97d579d1ee
Change-Id: I26d1541c0d016181be09afdb172715fda3dc41dc
1
2
api/current.txt
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
api/current.txt
Simple merge