OSDN Git Service

Merge "Retain allowBackup annotation when system+lock wallpaper becomes lock only...
authorChristopher Tate <ctate@google.com>
Thu, 13 Oct 2016 19:24:50 +0000 (19:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 13 Oct 2016 19:24:50 +0000 (19:24 +0000)
commitab4867484981e7dbef983137fdaed4efe1a44579
treee2fb2e04eeda51ad804ce26722976d4d8065e19e
parent329fed87b9b401baa48ab840192a61847d44ed71
parentd344b407df69c2dd52bbf5d0ea4e672c2ef95ca2
Merge "Retain allowBackup annotation when system+lock wallpaper becomes lock only am: edd8dc83d5 am: 4cb8e2de6f" into nyc-mr1-dev-plus-aosp
am: d344b407df

Change-Id: Ie75c36576a821c7faa720bfae54d47b5e5560f85