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:59:30 +0000 (19:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 12 Apr 2017 19:59:30 +0000 (19:59 +0000)
am: 8edc09c3d6

Change-Id: Ibbc6ab46d58b258b881c508e5ccf6e09f5b405a2


Trivial merge