tree c554040ca22d299e50690703d2af270f7f778148
parent b6962dee097c1b4b2340bb396330860970e0fc30
parent 6ea7b630c21c622b930192dba10a2713f8f9eca2
author Christopher Tate <ctate@google.com> 1470851747 +0000
committer android-build-merger <android-build-merger@google.com> 1470851747 +0000

DO NOT MERGE: Backport N backup/restore stability work to M am: d6f3a11107 am: aac7d0442c
am: 6ea7b630c2  -s ours

Change-Id: Iefb7a9ad5f00b0f6e24c45fe5cf1d17cb0c97414