OSDN Git Service

Merge "Prevent OPP from opening files that aren't sent over Bluetooth" into mnc-dr...
authorAjay Panicker <apanicke@google.com>
Wed, 12 Apr 2017 20:04:02 +0000 (20:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 12 Apr 2017 20:04:02 +0000 (20:04 +0000)
am: 420091c7f7

Change-Id: I67262b5b54c3860eebe3672d337f21b3d823d907


Trivial merge