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:
6464c8d
58822be
)
Merge "Add audio presentation interface to Java API"
author
Mikhail Naganov
<mnaganov@google.com>
Thu, 1 Feb 2018 16:46:07 +0000
(16:46 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Thu, 1 Feb 2018 16:46:07 +0000
(16:46 +0000)
1
2
api/current.txt
patch
|
diff1
|
diff2
|
blob
|
history
core/jni/android_media_AudioTrack.cpp
patch
|
diff1
|
diff2
|
blob
|
history
media/java/android/media/AudioTrack.java
patch
|
diff1
|
diff2
|
blob
|
history
media/java/android/media/MediaExtractor.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
api/current.txt
Simple merge
diff --cc
core/jni/android_media_AudioTrack.cpp
Simple merge
diff --cc
media/java/android/media/AudioTrack.java
Simple merge
diff --cc
media/java/android/media/MediaExtractor.java
Simple merge