Merge branch 'security-summit' into 'master' 89/2789/2
authorSachin Agrawal <sachin.agrawal@intel.com>
Sun, 20 Sep 2015 02:14:42 +0000 (19:14 -0700)
committerSachin Agrawal <sachin.agrawal@intel.com>
Sun, 20 Sep 2015 02:14:42 +0000 (19:14 -0700)
commit6848338aebbe9c639e4e2bb01065e5ccff34092b
tree992d007a9324f2e560f12616e47c6bcfdb3ab59e
parent429230b487fba8932272891065956f1154f0e177
parent24c563ec03a6b314ab7c878d217ea83d02e5ecd9
Merge branch 'security-summit' into 'master'

* security-summit:
  Added AMS functionality to support on-demand ACL provisioning.
  Added Android support for Provisioning APIs
  Quick fix on getting secure port information

Conflicts:
android/android_api/base/jni/JniOcStack.cpp
android/examples/settings.gradle
resource/csdk/security/include/internal/secureresourcemanager.h
resource/csdk/security/src/secureresourcemanager.c

Change-Id: I57d1157e4c1e74425fe27757e7dfa8a4ef8d427a
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
android/android_api/base/jni/JniOcStack.cpp
android/android_api/base/jni/JniOcStack.h
android/examples/settings.gradle
resource/csdk/security/SConscript
resource/csdk/security/include/internal/secureresourcemanager.h
resource/csdk/security/include/securevirtualresourcetypes.h
resource/csdk/security/src/secureresourcemanager.c
resource/provisioning/examples/SConscript
resource/provisioning/unittests/SConscript