OSDN Git Service

Merge \"Back up / restore lock wallpapers\" into nyc-mr1-dev
authorChristopher Tate <ctate@google.com>
Tue, 12 Jul 2016 19:08:18 +0000 (19:08 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 12 Jul 2016 19:08:18 +0000 (19:08 +0000)
am: 2917abeef2

Change-Id: I85f0dbff5a5b50e57892553ae36459dd7594d736


Trivial merge