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)
commite585dae327a88e61df5c8364caa08edf1b2cb250
tree0687f84db12d5c0aa688d3682f48b227aa651803
parent651c55b44d30afa1ca1db36b4986fba6d9721924
parent2af4feeb2d15a7946245bf86b292977fe6a4694f
Merge "Prevent OPP from opening files that aren't sent over Bluetooth" into nyc-dev am: 159bb07e8f am: 3297f727f6 am: f264af88a8
am: 2af4feeb2d

Change-Id: I4103a6efeccbbcc94aff45632af1474960f0fddc