tree 082ad13cc614c9bf16802f59a7faa6ac14494b19
parent ba297baa0412c6e8e9ba6ad54f0ce0990bb60940
parent 8371d28717a9cce2fcceff5cf799cdc0fb3b3c09
author Android Build Merger (Role) <android-build-merger@google.com> 1476386046 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1476386048 +0000

Merge "Retain allowBackup annotation when system+lock wallpaper becomes lock only am: edd8dc83d5 am: 4cb8e2de6f" into nyc-mr1-dev-plus-aosp