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

Change-Id: I7bcf2f77f5ba100f9926f1932811d54e385c7587


Trivial merge