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:
2895b32
0d2dc94
)
[automerger] Fix TrackInfo parcel write am: 0d2dc943dc
author
Android Build Merger (Role)
<noreply-android-build-merger@google.com>
Fri, 13 Jul 2018 06:56:56 +0000
(06:56 +0000)
committer
Android Build Merger (Role)
<noreply-android-build-merger@google.com>
Fri, 13 Jul 2018 06:56:56 +0000
(06:56 +0000)
Change-Id: I7ea941c8cffa147d2c6a46f0428899bf001a2672
1
2
media/java/android/media/MediaPlayer.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
media/java/android/media/MediaPlayer.java
Simple merge