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:37:28 +0000 (19:37 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 12 Apr 2017 19:37:28 +0000 (19:37 +0000)
am: 3297f727f6

Change-Id: I25d3274bbabfa1a12f86683f855e7de206b7c1d8


Trivial merge