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:
9ede567
5b6c034
)
resolve merge conflicts of 5b6c034 to stage-aosp-master
author
Jae Seo
<jaeseo@google.com>
Wed, 6 Jul 2016 07:45:15 +0000
(
00:45
-0700)
committer
Jae Seo
<jaeseo@google.com>
Wed, 6 Jul 2016 07:45:15 +0000
(
00:45
-0700)
Change-Id: I664240e9a9b2693f912b5b2a8a1731d08f109bfe
1
2
services/core/java/com/android/server/media/MediaSessionService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/media/MediaSessionService.java
Simple merge
OSDN Git Service
