| commit | 00004c44d73f7f46e8f25188403ca17a70edea8f | [log] [tgz] |
|---|---|---|
| author | Julia Reynolds <juliacr@google.com> | Tue Aug 15 14:43:00 2017 -0400 |
| committer | Julia Reynolds <juliacr@google.com> | Wed Aug 16 20:58:49 2017 +0000 |
| tree | 381778e1a8bd28a4b6fba222422e7c129f3cf5e9 | |
| parent | 8d7cd4bcaa126eca061c49a32cb8e7a6ec17e88b [diff] |
Optionally append managed service approvals If the backup comes from a pre O device, don't wipe preexisting managed service grants (which were introduced in O). Merged-In: I142df7acb11309bc4f5f185e45a1f91f86d0334a Merged-In: Ie569972dc0d076718a3a9c59e1ebd942c5bfa987 Test: manual, restore from N to O DR Bug: 64232609 Change-Id: Ieec2c821d9a088c69a5bc143acf8537ba300202d