OSDN Git Service

Merge "Prevent OPP from opening files that aren't sent over Bluetooth" into nyc-dev...
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: 2af4feeb2d

Change-Id: I4103a6efeccbbcc94aff45632af1474960f0fddc


Trivial merge