commit | 0031626e58a6e88f1bfdd38b9c85b5b7190fcc77 | [log] [tgz] |
---|---|---|
author | Chris Tate <ctate@android.com> | Thu Oct 13 19:28:34 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Oct 13 19:28:34 2016 +0000 |
tree | e2fb2e04eeda51ad804ce26722976d4d8065e19e | |
parent | e1ed2384446490b229fdd2186ff8c9f5c425ef0c [diff] | |
parent | 9f65c6d01761c2bfae7e4a46e6f3ed33bff3405b [diff] |
Merge "Retain allowBackup annotation when system+lock wallpaper becomes lock only" into nyc-mr1-dev am: 4bd56fbbee am: 622e97ffaf am: 9f65c6d017 Change-Id: I16df45f469693e0103c2c222bd93b9f5c0d7958b