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)
commitae799ec9ae825a52b392c638e52c6389b22e7933
tree85dfac2b38f7426df10b4ab2d8b513d7de3dd09a
parent50178d0c5e07669643d45e5c8d8ef1229a3dd66c
parente585dae327a88e61df5c8364caa08edf1b2cb250
Merge "Prevent OPP from opening files that aren't sent over Bluetooth" into nyc-dev am: 159bb07e8f am: 3297f727f6 am: f264af88a8 am: 2af4feeb2d
am: e585dae327  -s ours

Change-Id: Ibe4dc4ddf16fadf7ff5a191852cb19fa03c74ee8