tree a71636628388aa0f62fdc1cad2773e8067107ad4
parent 61038ddb61f383f15540fb007db7c62828a74bd1
parent d6f3a11107f0c3c5708a407fe21e3faf39059916
author Christopher Tate <ctate@google.com> 1470850108 +0000
committer android-build-merger <android-build-merger@google.com> 1470850108 +0000

DO NOT MERGE: Backport N backup/restore stability work to M
am: d6f3a11107

Change-Id: Ibd6e1be57f129d9ea89c8a44332da830944cf2b1