OSDN Git Service

Merge tag 'android-6.0.1_r74' into marshmallow-x86
authorChih-Wei Huang <cwhuang@linux.org.tw>
Tue, 10 Jan 2017 14:08:30 +0000 (22:08 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Tue, 10 Jan 2017 14:08:30 +0000 (22:08 +0800)
commitcfa7883ecd22be5291432944785db118febbe0a8
tree8933dab6aa58797bc44bd611032fc5a6f46a0b0d
parent16953059fd448fa1e69c58cac1d1c1fca3dae1ca
parentef525e8d721a69310044eca14993df8b13ac1b14
Merge tag 'android-6.0.1_r74' into marshmallow-x86

Android 6.0.1 release 74
core/java/android/bluetooth/BluetoothDevice.java
core/jni/com_android_internal_os_Zygote.cpp
services/core/java/com/android/server/am/ActivityManagerService.java