commit | 622e97ffafc8bc7160219212be9b5d46e20a98d3 | [log] [tgz] |
---|---|---|
author | Chris Tate <ctate@android.com> | Thu Oct 13 19:04:43 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Oct 13 19:04:43 2016 +0000 |
tree | 1d76f07b81d46a4f94efa25a06df00f7d7798ba7 | |
parent | 4cb8e2de6f55e3761eb48b06d664bf670be68976 [diff] | |
parent | 4bd56fbbee592e2e773d2f4ed1f51623cbb9489f [diff] |
Merge "Retain allowBackup annotation when system+lock wallpaper becomes lock only" into nyc-mr1-dev am: 4bd56fbbee Change-Id: I19fae35338016bbbb7de07e8c9d978bab2e088fe