OSDN Git Service

resolved conflicts for merge of c0dd3adf to lmp-mr1-dev-plus-aosp
[android-x86/packages-apps-Camera2.git] / res / drawable-hdpi / ic_hdr_plus_on_normal.png
res/drawable-hdpi/ic_hdr_plus_on_normal.png