Merge branch 'tizen' into security-manager 23/156723/1
authorZofia Abramowska <z.abramowska@samsung.com>
Thu, 19 Oct 2017 15:39:54 +0000 (17:39 +0200)
committerZofia Abramowska <z.abramowska@samsung.com>
Thu, 19 Oct 2017 15:41:29 +0000 (17:41 +0200)
commit5aafad94d2f96c3ca9d13435be07621982adf512
tree4f7086b581690999925055f2ab75cbd542477585
parentb0b52bc6aadee215649803da3a7541596ae3fe51
parentd9b4aa1b29ceefb405667d726d887eaeb6e1de4f
Merge branch 'tizen' into security-manager

Change-Id: I3fa314322c8005c432cbdcfca15043d3679622b9