diff options
| author | 2016-10-13 19:14:06 +0000 | |
|---|---|---|
| committer | 2016-10-13 19:14:08 +0000 | |
| commit | d344b407df69c2dd52bbf5d0ea4e672c2ef95ca2 (patch) | |
| tree | 082ad13cc614c9bf16802f59a7faa6ac14494b19 /libs/androidfw/AttributeResolution.cpp | |
| parent | ba297baa0412c6e8e9ba6ad54f0ce0990bb60940 (diff) | |
| parent | 8371d28717a9cce2fcceff5cf799cdc0fb3b3c09 (diff) | |
Merge "Retain allowBackup annotation when system+lock wallpaper becomes lock only am: edd8dc83d5 am: 4cb8e2de6f" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'libs/androidfw/AttributeResolution.cpp')
0 files changed, 0 insertions, 0 deletions