Merge "Include fix for fuelmenu" into stable/brahmaputra
authorStefan Berg <stefan.k.berg@ericsson.com>
Mon, 8 Feb 2016 11:20:54 +0000 (11:20 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Mon, 8 Feb 2016 11:20:54 +0000 (11:20 +0000)

Trivial merge