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: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: f264af88a8

Change-Id: If65eab1ca7f9409fc47b522df8be6a05e73e7878


Trivial merge