Merge remote-tracking branch 'origin/notification-service'
authorcc <ch79.cho@samsung.com>
Tue, 13 Sep 2016 05:01:32 +0000 (14:01 +0900)
committerMadan Lanka <lanka.madan@samsung.com>
Wed, 21 Sep 2016 09:22:04 +0000 (09:22 +0000)
commitfce7ab584a35e3b6b33c8d3c2dbab280c0b36412
tree44bdef57642fae5748a3c88ca872300d68a6270a
parentff3fb9a2decbfd6d68f9e5b590bf21f112500f23
Merge remote-tracking branch 'origin/notification-service'

Android wrapper service is updated.

Change-Id: Iec12e1b9f48b60913e5915e9b3a8bfcf7c4bd891
Signed-off-by: cc <ch79.cho@samsung.com>
(cherry picked from commit 23d997e80a1d6f23da6c5e345ed77c30a1595861)
Reviewed-on: https://gerrit.iotivity.org/gerrit/11865
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Abitha Shankar <abitha.s@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
service/notification/examples/android/NotiConsumerExample/app/build.gradle
service/notification/examples/android/NotiConsumerExample/app/src/main/java/com/sec/noticonsumerexample/ConsumerProxy.java
service/notification/examples/android/NotiConsumerExample/app/src/main/java/com/sec/noticonsumerexample/MainActivity.java
service/notification/examples/android/NotiConsumerExample/app/src/main/res/layout/activity_main.xml
service/notification/examples/android/NotiConsumerExample/iotivity-armeabi-notification-service-release/build.gradle [moved from service/notification/examples/android/NotiConsumerExample/iotivity-armeabi-notification-service-debug/build.gradle with 84% similarity]
service/notification/examples/android/NotiConsumerExample/iotivity-base-armeabi-debug/build.gradle [deleted file]
service/notification/examples/android/NotiConsumerExample/iotivity-base-armeabi-release/build.gradle [new file with mode: 0755]
service/notification/examples/android/NotiConsumerExample/settings.gradle
service/notification/examples/android/NotiProviderExample/app/src/main/java/com/sec/notiproviderexample/MainActivity.java
service/notification/examples/android/NotiProviderExample/app/src/main/java/com/sec/notiproviderexample/ProviderProxy.java