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:44:52 +0000 (17:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 10 Aug 2016 17:44:52 +0000 (17:44 +0000)
am: a8e21860af

Change-Id: I20921b9aa611838bc88fcabe1dc619de0bd9f6c1


Trivial merge