diff options
| author | Andrew Rossignol <aarossig@google.com> | 2017-01-12 19:08:24 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-01-12 19:08:24 +0000 |
| commit | d26d2af79e5bb52f4392bdbfd1858f905f80480d (patch) | |
| tree | 2f6da554f8069a5af73a81d215a23f2e876ca038 /libs/androidfw/AttributeResolution.cpp | |
| parent | 52cab4a4f79559333611d2fba3591753110c740d (diff) | |
| parent | 6ebc52a95045a0603535f1a1ed5b79daabfcc4aa (diff) | |
Merge "Revert "DO NOT MERGE ANYWHERE default_wallpaper: replace with black"" into nyc-mr2-dev am: c65a010a39 -s ours
am: 6ebc52a950 -s ours
Change-Id: I1ae4fb72bc6a5576dfb3894f8b24e529cd52e0a6
Diffstat (limited to 'libs/androidfw/AttributeResolution.cpp')
0 files changed, 0 insertions, 0 deletions