tree afe9fd989d0020525cc7a87c5e6fd58b937799ac
parent 22d3fe139d921552c68184a743622a5a63a9fb7e
parent 34074f4ff54a0c922272140a7da3ae1050ebe66c
author Paladox <thomasmulhall410@yahoo.com> 1512348488 +0000
committer Paladox none <thomasmulhall410@yahoo.com> 1512349755 +0000

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Fix support for Velocity and Soy comments
  Use map.computeIfAbsent
  Fix Eclipse warnings about raw types
  Rename parameter to comply with naming convention
  Replace anonymous class with ThreadLocal.withInitial
  Use Logger's built-in formatting
  Move array designators to the type
  Clarify constant declaration
  Replace FluentIterable with Java Stream
  Remove unnecessary import
  Avoid redundant array creation
  Remove redundant specification of type arguments
  Remove redundant semicolons
  Apply google-java-format to all files

Change-Id: Iac4701bb1ab3bc815fb5835387a17a4572405447