tree 9171c401a040348084da349d0671c2662ef518a6
parent 539d33811c3af05fc61d1bdab14a9709c08cd3b5
author Iftekharul Islam <iislam@us.ibm.com> 1501252788 -0500
committer Adriana Kobylak <anoo@us.ibm.com> 1507574490 -0500

Fixed sensor page after merge conflicts

Change-Id: I9d4e0fb5d74feb681c9c9708e6efb62602b3e5eb
Signed-off-by: Iftekharul Islam <iislam@us.ibm.com>