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:
8f601e7
2d7ef64
)
Merge "AudioPlaybackConfiguration: prevent race condition on mIPlayerShell" into...
author
Jean-Michel Trivi
<jmtrivi@google.com>
Fri, 15 Sep 2017 11:35:33 +0000
(11:35 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 15 Sep 2017 11:35:33 +0000
(11:35 +0000)
am:
2d7ef64f47
Change-Id: Ib4bd34bf0915afdd3e6c91c2ad34594e1e373a36
1
2
media/java/android/media/AudioManager.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
media/java/android/media/AudioManager.java
Simple merge