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

Change-Id: Ieac69289983354daef9be1b21627b802576ee289


Trivial merge