OSDN Git Service

Merge tag 'android-6.0.1_r61' into marshmallow-x86
authorChih-Wei Huang <cwhuang@linux.org.tw>
Wed, 3 Aug 2016 07:40:30 +0000 (15:40 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Wed, 3 Aug 2016 07:40:30 +0000 (15:40 +0800)
commit79258d3daad90e4a95598641e8fa1c004d5200e1
tree73203d3471a9c4460f24c5b8ab3f33fc8f40d549
parentf9b08b0196c56d3c2a32192f6eaf0b62e41ae3b0
parent4e4743a354e26467318b437892a9980eb9b8328a
Merge tag 'android-6.0.1_r61' into marshmallow-x86

Android 6.0.1 Release 61 (MOB30Z)

Conflicts:
services/backup/java/com/android/server/backup/BackupManagerService.java
services/backup/java/com/android/server/backup/BackupManagerService.java
services/core/java/com/android/server/am/ActivityManagerService.java
services/core/java/com/android/server/pm/PackageManagerService.java