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:43:59 +0000 (19:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 12 Apr 2017 19:43:59 +0000 (19:43 +0000)
commit2af4feeb2d15a7946245bf86b292977fe6a4694f
tree7ae4877ff8483b694026c940d20d7c4d095132c3
parentd93beba667b9c8df7bcda2cf64490591aedb04b3
parentf264af88a8114dbd25a7c0a43e96f02cc9c52f79
Merge "Prevent OPP from opening files that aren't sent over Bluetooth" into nyc-dev am: 159bb07e8f am: 3297f727f6
am: f264af88a8

Change-Id: If65eab1ca7f9409fc47b522df8be6a05e73e7878