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 19:37:28 +0000 (19:37 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 12 Apr 2017 19:37:28 +0000 (19:37 +0000)
am: b04d7559e4

Change-Id: I14d62e2bbd98d5d7e6f07de749ea82c14c5d4af2


Trivial merge