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:
9ae4a08
f9f240a
)
Merge "MediaSession: Update javadoc of prepare-related methods" into nyc-dev
author
Donghyun Cho
<donghyun@google.com>
Fri, 26 Feb 2016 08:23:40 +0000
(08:23 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Fri, 26 Feb 2016 08:23:41 +0000
(08:23 +0000)
1
2
media/java/android/media/session/MediaSession.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
media/java/android/media/session/MediaSession.java
Simple merge