diff options
| author | Andrew Rossignol <aarossig@google.com> | 2017-01-12 18:59:56 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-01-12 18:59:56 +0000 |
| commit | 6ebc52a95045a0603535f1a1ed5b79daabfcc4aa (patch) | |
| tree | cef1883d4e41bd731ed872af19f0423a6679b1e5 /libs/androidfw/AttributeResolution.cpp | |
| parent | 4fa95e7bbbe68468618a24e83e356e31acefbd0e (diff) | |
| parent | c65a010a39a489acaf3de3708823202a25ef8065 (diff) | |
Merge "Revert "DO NOT MERGE ANYWHERE default_wallpaper: replace with black"" into nyc-mr2-dev
am: c65a010a39 -s ours
Change-Id: I39efaeb589830e7d448e208d37a079c798477224
Diffstat (limited to 'libs/androidfw/AttributeResolution.cpp')
0 files changed, 0 insertions, 0 deletions