Merge "All plug-ins except those explicitly rebased are disabled" into stable/brahmaputra
authorStefan Berg <stefan.k.berg@ericsson.com>
Fri, 29 Jan 2016 13:29:24 +0000 (13:29 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Fri, 29 Jan 2016 13:29:24 +0000 (13:29 +0000)
commita9a74a47a32c57d664c4db540b6019292345318d
tree8f9c3012cb2909c7fd71a1f9ef4a8ed727442ccc
parent9626f589b3c8182307a2de624a1c97b1181eecc3
parent77b2a5dd846bb1f805a97581bd32238cda4cba78
Merge "All plug-ins except those explicitly rebased are disabled" into stable/brahmaputra