tree 9c0d7814352d0a1558b8f6f2c5c82d95fd11290e
parent 76b3d16cece260d859800ca62826fe92bedc26f5
parent 48cebb2f2e8fc0530468112d80582171a9eba7e3
author Hugo Arès <hugo.ares@ericsson.com> 1493201899 +0200
committer Hugo Arès <hugo.ares@ericsson.com> 1493201986 +0200

Merge branch 'stable-2.12' into stable-2.13

* stable-2.12:
  Make SimpleDateFormat thread safe

Change-Id: I9c9096d58d876cd0270ecb481278e9f8f1abfe03