tree 81972f2595795b98607767bd5a0543ffcccdcb00
parent e86aba29d4480c9aa7f7ffcce4f5825ef1731cc2
parent e906a82151014761566d20e9a10ffa6314e85d1c
author Hector Oswaldo Caballero <hector.caballero@ericsson.com> 1521107162 -0400
committer Hector Oswaldo Caballero <hector.caballero@ericsson.com> 1521107162 -0400

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Remove Joda dependency

Change-Id: I676579d29d3bcfb699b4e0dde8286c26cc272ecd