OSDN Git Service

DO NOT MERGE: Backport N backup/restore stability work to M am: d6f3a11107 am: aac7d0...
authorChristopher Tate <ctate@google.com>
Wed, 10 Aug 2016 18:03:38 +0000 (18:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 10 Aug 2016 18:03:38 +0000 (18:03 +0000)
am: 5eac1c2544

Change-Id: Ibd925a475c5ae43a6ab07c0c8920167e7ce85cec


Trivial merge