Merge the code from tizen_2.4 06/56606/2 accepted/tizen/mobile/20160114.012931 accepted/tizen/tv/20160114.013220 accepted/tizen/wearable/20160114.013336 submit/tizen_mobile/20160113.070038 submit/tizen_tv/20160113.070042 submit/tizen_wearable/20160113.070045
authorTaejin Woo <tt.woo@samsung.com>
Fri, 8 Jan 2016 04:38:23 +0000 (13:38 +0900)
committerTaejin Woo <tt.woo@samsung.com>
Tue, 12 Jan 2016 11:27:44 +0000 (20:27 +0900)
commit8366d586d8d4c9d4e3d2728e647bd0586c12016d
treecf3242308ece578e7b9903de2012f2f6e66a09a0
parentcf63a12242d6527feb4d01195ca808405afe42da
Merge the code from tizen_2.4

Change-Id: I7386c5d3ccf7022649ed17c7cb65e7f4e1b2ee27
Signed-off-by: Taejin Woo <tt.woo@samsung.com>
136 files changed:
ChangeLog
Makefile.am
Makefile.plugins
Makefile.tools
android/Android.mk
android/Makefile.am
android/avctp.c
android/avdtp.c
android/avrcp-lib.c
android/avrcp-lib.h
android/avrcp.c
android/bluetoothd-snoop.c
android/gatt.c
android/hal-gatt.c
android/hal-ipc-api.txt
android/hal-msg.h
android/hal-sco.c
android/hardware/bt_gatt_server.h
android/hidhost.c
android/hog.c
android/hog.h
android/pan.c
android/pics-bnep.txt [new file with mode: 0644]
android/pixit-bnep.txt [new file with mode: 0644]
android/pts-bnep.txt [new file with mode: 0644]
attrib/gatt-service.c
attrib/gatt.h
attrib/gattrib.c
client/gatt.c
client/gatt.h
client/main.c
configure.ac
doc/adapter-api.txt
doc/advertising-api.txt [new file with mode: 0644]
doc/gatt-api.txt
doc/mgmt-api.txt
doc/settings-storage.txt
doc/test-coverage.txt
emulator/btdev.c
emulator/btdev.h
emulator/hciemu.c
emulator/hciemu.h
emulator/hfp.c
emulator/le.c
emulator/vhci.c
gdbus/client.c
gdbus/gdbus.h
gdbus/object.c
lib/bluetooth.c
lib/bluetooth.h
lib/bnep.h
lib/hci_lib.h
lib/mgmt.h
lib/uuid.h
monitor/btsnoop.c
monitor/btsnoop.h
monitor/control.c
monitor/control.h
monitor/l2cap.c
monitor/main.c
monitor/packet.c
obexd/client/mns-tizen.c
obexd/client/pbap.c
obexd/plugins/mas.c
obexd/plugins/opp.c
obexd/plugins/pbap.c
packaging/bluez.spec
plugins/policy.c
plugins/sixaxis.c
profiles/audio/a2dp.c
profiles/audio/a2dp.h
profiles/audio/avctp.c
profiles/audio/avctp.h
profiles/audio/avdtp.c
profiles/audio/avrcp.c
profiles/audio/avrcp.h
profiles/audio/control.c
profiles/audio/control.h
profiles/audio/media.c
profiles/audio/player.c
profiles/audio/player.h
profiles/audio/sink.c
profiles/audio/source.c
profiles/audio/transport.c
profiles/gap/gas.c
profiles/network/bnep.c
profiles/network/bnep.h
profiles/network/connection.c
profiles/network/server.c
src/adapter.c
src/adapter.h
src/advertising.c [new file with mode: 0644]
src/advertising.h [new file with mode: 0644]
src/attrib-server.c
src/device.c
src/device.h
src/eir.c
src/gatt-client.c
src/gatt-database.c
src/gatt.c
src/hcid.h
src/main.c
src/main_m.conf
src/main_w.conf
src/profile.c
src/shared/att-types.h
src/shared/att.c
src/shared/att.h
src/shared/btsnoop.c
src/shared/btsnoop.h
src/shared/gatt-client.c
src/shared/gatt-client.h
src/shared/gatt-db.c
src/shared/gatt-db.h
src/shared/gatt-helpers.c
src/shared/tester.c
src/shared/tester.h
test/advertisement-example [new file with mode: 0644]
tools/bneptest.c [new file with mode: 0644]
tools/btgatt-client.c
tools/btgatt-server.c
tools/btmgmt.c
tools/btsnoop.c
tools/mgmt-tester.c
tools/mpris-proxy.c
tools/obexctl.c
tools/oobtest.c
unit/test-avctp.c
unit/test-avdtp.c
unit/test-avrcp.c
unit/test-gatt.c
unit/test-gdbus-client.c
unit/test-hfp.c
unit/test-hog.c [new file with mode: 0644]
unit/test-sdp.c
unit/test-uhid.c