tree c242a8e663db397961c9c04e14c3fc64a95e4791
parent f264af88a8114dbd25a7c0a43e96f02cc9c52f79
parent 3a736ff1a2f6f569c104e5ded2037c2674be155b
author Ajay Panicker <apanicke@google.com> 1492026840 +0000
committer android-build-merger <android-build-merger@google.com> 1492026840 +0000

Merge "Prevent OPP from opening files that aren't sent over Bluetooth" into mnc-dr-dev am: 2a2612335a am: b04d7559e4 am: 5bd1e81103 am: 074cd25c31
am: 3a736ff1a2

Change-Id: Ie09ae03bb81a03bef201bd41c05eafd56f5d09be