Reverse merged revision(s) 988-987 from VisitFace/RtspNativeCodec: JsonCpp和...

chenke

2017-08-09 a0092014ee12abf06edb1788b189cc7c57336063

1
2
3
4
5
6
[
    {
        "merged": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-mdpi\\ic_launcher.png",
        "source": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\src\\main\\res\\mipmap-mdpi\\ic_launcher.png"
    }
]