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:
bf10629
8fe1165
)
Merge tag 'android-7.1.2_r39' into nougat-x86
nougat-x86
android-x86-7.1-r3
android-x86-7.1-r4
android-x86-7.1-r5
author
Chih-Wei Huang
<cwhuang@linux.org.tw>
Wed, 16 Oct 2019 15:01:56 +0000
(23:01 +0800)
committer
Chih-Wei Huang
<cwhuang@linux.org.tw>
Wed, 16 Oct 2019 15:01:56 +0000
(23:01 +0800)
Android 7.1.2 Release 39 (
5787804
)
Conflicts:
services/core/java/com/android/server/clipboard/ClipboardService.java
services/core/java/com/android/server/wm/WindowManagerService.java
Trivial merge
OSDN Git Service
