| commit | f051de84d53c58cbeb9d23a3088d1d3e3eedd317 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Thu Oct 13 19:17:20 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Oct 13 19:17:22 2016 +0000 |
| tree | 082ad13cc614c9bf16802f59a7faa6ac14494b19 | |
| parent | 490a70712944678852d8fb1873d77cc75bfe404d [diff] | |
| parent | 9f65c6d01761c2bfae7e4a46e6f3ed33bff3405b [diff] |
Merge "Merge "Retain allowBackup annotation when system+lock wallpaper becomes lock only" into nyc-mr1-dev am: 4bd56fbbee am: 622e97ffaf" into nyc-mr1-dev-plus-aosp