OSDN Git Service

resolved conflicts for merge of c45ff35f to klp-modular-dev
authorChristopher Tate <ctate@google.com>
Wed, 5 Mar 2014 20:28:04 +0000 (12:28 -0800)
committerChristopher Tate <ctate@google.com>
Wed, 5 Mar 2014 20:28:04 +0000 (12:28 -0800)
commit422b2656741520448815b230f7c73ad67a4c4e95
treee3a1abb57d06feee4dfab11fe2e82382f4298004
parent8106dce705ba69d5bc0ccafa8e21068216f42a5f
parentc45ff35f21cf84b6d31cf57ea4db1af0732da07c
resolved conflicts for merge of c45ff35f to klp-modular-dev

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