OSDN Git Service

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
authorChih-Wei Huang <cwhuang@linux.org.tw>
Wed, 16 Oct 2019 15:01:56 +0000 (23:01 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Wed, 16 Oct 2019 15:01:56 +0000 (23:01 +0800)
commit19acc095ae8ec188c004b2801941c16e50aac30e
treec4f9bc106ceb4ccf72cd71e35e7fabc11675f7b3
parentbf10629e34e836527a7cb855d633f6a932fed89a
parent8fe116528f1caf04f1a1edd07ec054cf463cc985
Merge tag 'android-7.1.2_r39' into nougat-x86

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