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:44 +0000 (20:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 12 Apr 2017 20:04:44 +0000 (20:04 +0000)
am: 78e0c236a6

Change-Id: I3d47854e8044276f2e86086cc5c53284a3cd49a9


Trivial merge