tree 8c820edefc28c43782da99611b026a5bfe8dba86
parent cbddbc2b9571b1d692fb823ba8791ccd60b52421
parent ae176aabcb74338d5e7b02bfb4acf63a37e76cce
author Hector Oswaldo Caballero <hector.caballero@ericsson.com> 1513795959 -0500
committer Hector Oswaldo Caballero <hector.caballero@ericsson.com> 1513796209 -0500

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Fix indentation
  Add Prolog skylark rule
  Set gerrit maven local api to version 2.14.7-SNAPSHOT
  Update API to 2.14.6
  Upgrade Gerrit API to 2.14.5.1

Change-Id: I731065b7bb97485fd929e340674af9ca92645548