OSDN Git Service

Merge "Add screensaver settings to backup list" into oc-dr1-dev
authorJason Monk <jmonk@google.com>
Mon, 10 Jul 2017 20:29:25 +0000 (20:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 10 Jul 2017 20:29:25 +0000 (20:29 +0000)
am: 2c3c58d917

Change-Id: I981327b35f341600f908d479d4a4d36356b18b1d


Trivial merge