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)
am: 2a2612335a

Change-Id: I8d4d89273541425351b4d46690156fa60cc98c92


Trivial merge