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: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)
commit3a736ff1a2f6f569c104e5ded2037c2674be155b
treeaaf9756928ff44e57ea793af7a85b8b7f72b3cc4
parent3297f727f6abebf23f29174438a4a69da919ea72
parent074cd25c31bb1191a3975dd036450cd6425de77b
Merge "Prevent OPP from opening files that aren't sent over Bluetooth" into mnc-dr-dev am: 2a2612335a am: b04d7559e4 am: 5bd1e81103
am: 074cd25c31

Change-Id: I7bcf2f77f5ba100f9926f1932811d54e385c7587