Merge "Rebased patch due to upstream changes"
authorStefan K. Berg <stefan.k.berg@ericsson.com>
Fri, 9 Oct 2015 05:09:08 +0000 (05:09 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Fri, 9 Oct 2015 05:09:08 +0000 (05:09 +0000)
commit7033f1d672d27fdbb6ad71cee2d3be6c2b979333
tree71a8afdb37afc954eeafa7bd1782c93d9a74d0af
parent3826a75ae3060b350ecefbc0eb20b4e81786638d
parentf95725829cf93d69b33224c0a7b72bc84b541cb7
Merge "Rebased patch due to upstream changes"