Merge "Trying using the downstream-merge-java template"
authorAndrew Grimberg <agrimberg@linuxfoundation.org>
Fri, 17 Feb 2017 14:53:50 +0000 (14:53 +0000)
committerGerrit Code Review <gerrit@openecomp.org>
Fri, 17 Feb 2017 14:53:50 +0000 (14:53 +0000)
commit7c822252e0aea6451fa7e758afc558fb40f531a5
tree75ae2cb1d2230f10b1493cd452a68ef49600f950
parentb155cdd2ff971931d0552e14dc85099b10161f9e
parentaeac1a0d29b58d0e89ed0b877a8a3273afb6d2a7
Merge "Trying using the downstream-merge-java template"