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:
3191212
81fbdad
)
am 81fbdade: resolved conflicts for merge of 534f3e94 to jb-mr1-dev
author
Marco Nelissen
<marcone@google.com>
Thu, 20 Mar 2014 17:47:34 +0000
(10:47 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Thu, 20 Mar 2014 17:47:34 +0000
(10:47 -0700)
* commit '
81fbdade8db4117157ea48602be121e6cf5597dd
':
Verify certificates
1
2
media/java/android/media/AudioService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
media/java/android/media/AudioService.java
Simple merge
OSDN Git Service
