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

Change-Id: Ie09ae03bb81a03bef201bd41c05eafd56f5d09be


Trivial merge