OSDN Git Service

Merge "Prevent OPP from opening files that aren't sent over Bluetooth" into mnc-dr-dev
authorAjay Panicker <apanicke@google.com>
Wed, 12 Apr 2017 19:32:29 +0000 (19:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 12 Apr 2017 19:32:29 +0000 (19:32 +0000)
commitb04d7559e4a3ee33a3384b3cd3f8b3fce4b3da44
treecf42aae57bf20ec3b6925093a0261a8e08ffcb85
parent76f57b210958ca9cf91d9cf2f6a8fe7af43281a4
parent2a2612335a75e01ca716e921a62fc887538feeb9
Merge "Prevent OPP from opening files that aren't sent over Bluetooth" into mnc-dr-dev
am: 2a2612335a

Change-Id: I8d4d89273541425351b4d46690156fa60cc98c92