Merge branch 'tizen_3.0' into tizen

Change-Id: Id2f36ff4263f23f3d81bdfd95ad0e271505cb643
Signed-off-by: Piotr Kosko <p.kosko@samsung.com>

diff --git a/src/bluetooth/bluetooth_instance.cc b/src/bluetooth/bluetooth_instance.cc
index 322f45f..158555f 100755 (executable)
--- a/src/bluetooth/bluetooth_instance.cc
+++ b/src/bluetooth/bluetooth_instance.cc
@@ -29,9 +29,9 @@ using namespace common;
 BluetoothInstance::BluetoothInstance() :
     bluetooth_adapter_(*this),
     bluetooth_device_(bluetooth_adapter_),
-    bluetooth_health_application_(bluetooth_health_profile_handler_),
     bluetooth_health_channel_(),
     bluetooth_health_profile_handler_(*this),
+    bluetooth_health_application_(bluetooth_health_profile_handler_),
     bluetooth_service_handler_(bluetooth_adapter_),
     bluetooth_socket_(bluetooth_adapter_),
     bluetooth_le_adapter_(*this),

diff --git a/src/bluetooth/bluetooth_instance.h b/src/bluetooth/bluetooth_instance.h
index daeabef..30bb4cf 100755 (executable)
--- a/src/bluetooth/bluetooth_instance.h
+++ b/src/bluetooth/bluetooth_instance.h
@@ -50,9 +50,9 @@ class BluetoothInstance: public common::ParsedInstance {
  private:
   BluetoothAdapter bluetooth_adapter_;
   BluetoothDevice bluetooth_device_;
-  BluetoothHealthApplication bluetooth_health_application_;
   BluetoothHealthChannel bluetooth_health_channel_;
   BluetoothHealthProfileHandler bluetooth_health_profile_handler_;
+  BluetoothHealthApplication bluetooth_health_application_;
   BluetoothServiceHandler bluetooth_service_handler_;
   BluetoothSocket bluetooth_socket_;
   BluetoothLEAdapter bluetooth_le_adapter_;