Merge branch 'master' into 'security-summit' branch.
authorSachin Agrawal <sachin.agrawal@intel.com>
Wed, 2 Sep 2015 18:50:42 +0000 (11:50 -0700)
committerSachin Agrawal <sachin.agrawal@intel.com>
Wed, 2 Sep 2015 18:50:42 +0000 (11:50 -0700)
commit3e9a15c97f2633f0e8fc7043782685374e5fd183
tree1ca487a5e153a89baa14ef195e73de9e2c8f74a2
parent59cd3b963bd1da53d5638d2ccb830ca81e50886f
parent357aaf90c14532ac54123061465f009478933ed2
Merge branch 'master' into 'security-summit' branch.

Change-Id: Icea82717102b17826bed7fd42f29aad64534ef72
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>