commit | 9f65c6d01761c2bfae7e4a46e6f3ed33bff3405b | [log] [tgz] |
---|---|---|
author | Chris Tate <ctate@android.com> | Thu Oct 13 19:16:47 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Oct 13 19:16:47 2016 +0000 |
tree | 082ad13cc614c9bf16802f59a7faa6ac14494b19 | |
parent | d344b407df69c2dd52bbf5d0ea4e672c2ef95ca2 [diff] | |
parent | 622e97ffafc8bc7160219212be9b5d46e20a98d3 [diff] |
Merge "Retain allowBackup annotation when system+lock wallpaper becomes lock only" into nyc-mr1-dev am: 4bd56fbbee am: 622e97ffaf Change-Id: I5ebed04800d3acf758787067b63bca50fa957649