Merge "framework: Add reworked framework to repo"
authorMaryam Tahhan <maryam.tahhan@intel.com>
Mon, 8 Jun 2015 15:03:08 +0000 (15:03 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Mon, 8 Jun 2015 15:03:08 +0000 (15:03 +0000)

Trivial merge