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 20:04:26 +0000 (20:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 12 Apr 2017 20:04:26 +0000 (20:04 +0000)
am: e585dae327  -s ours

Change-Id: Ibe4dc4ddf16fadf7ff5a191852cb19fa03c74ee8


Trivial merge