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: 71c51769 am: 963cc948 am: db7514b2 am: 842c86c7 am: bdd599cc am: 90460883
am: bb4285e5
Change-Id: I67262b5b54c3860eebe3672d337f21b3d823d907