Merge "Prevent OPP from opening files that aren't sent over Bluetooth" into...
Merge "Prevent OPP from opening files that aren't sent over Bluetooth" into mnc-dr-dev am: 2a261233 am: b04d7559 am: 5bd1e811 am: 074cd25c
am: 3a736ff1
Change-Id: Ie09ae03bb81a03bef201bd41c05eafd56f5d09be