OSDN Git Service

Merge "DO NOT MERGE: Backport N backup/restore stability work to M" into mnc-dr-dev...
authorChris Tate <ctate@android.com>
Wed, 10 Aug 2016 17:55:56 +0000 (17:55 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 10 Aug 2016 17:55:56 +0000 (17:55 +0000)
am: 1d64d33ba8  -s ours

Change-Id: I68bc1793b55e6e2bf660ea6c41611e819b3f5e9a


Trivial merge