Merge "Support apps sharing file:// URIs with the camera API" into rvc-dev am:...
Merge "Support apps sharing file:// URIs with the camera API" into rvc-dev am: efbc3f2d am: d371efcf
Original change: undetermined
Change-Id: I4a2afe4cd1782ba5a1179207eb5fdac22cec842d