OSDN Git Service

resolve merge conflicts of 56a2b529373b to nyc-dev am: d7dcc3e227 am: 34377e0357
[android-x86/frameworks-base.git] / core / res / res / drawable-nodpi / default_wallpaper.png
core/res/res/drawable-nodpi/default_wallpaper.png