OSDN Git Service

Merge "Fix the deadlock problem" am: fa228e06f6 am: e8c0e1098e am: 35b99da33a
authorChris Tate <ctate@android.com>
Fri, 2 Dec 2016 23:02:58 +0000 (23:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 2 Dec 2016 23:02:58 +0000 (23:02 +0000)
commit11e9cec1385fa6b5ad9c4a61d56696abc931514a
treef625cd63dfee6d2a1fe62d33e79f6af80542838f
parent015604ff1d27f810574393a16a0751bb4924ee1e
parent0455c300353b7f5b651491e94bb9e38efe5fa0db
Merge "Fix the deadlock problem" am: fa228e06f6 am: e8c0e1098e am: 35b99da33a
am: 0455c30035

Change-Id: Ib08f8deadfe6085d6d4368527892c799c42f0757
services/backup/java/com/android/server/backup/BackupManagerService.java