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:12:06 +0000 (18:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 10 Aug 2016 18:12:06 +0000 (18:12 +0000)
am: 3015d9be67

Change-Id: If74a836b1ab67c3dd32e0a177ddc3cbc2b17c173


Trivial merge