Merge "Fix wrong offset in environment array" into stable/brahmaputra
authorStefan Berg <stefan.k.berg@ericsson.com>
Fri, 29 Jan 2016 13:36:44 +0000 (13:36 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Fri, 29 Jan 2016 13:36:44 +0000 (13:36 +0000)

Trivial merge