tree e57914b773048d3ccb157afb46fcfa6537e87bb6
parent 1a2c8037bedcbc0ca261ceda9c135cf1d13da5bc
parent a29b921dc15c75af21a7817f6e39ee1063446a4b
author David Pursehouse <dpursehouse@collab.net> 1527074278 +0900
committer David Pursehouse <dpursehouse@collab.net> 1527074377 +0900

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Use Logger's built-in string formatting where possible
  Doc: Fix code example in JS API

Change-Id: I1b953b6d9ab5cd066b8b6f43bb1843dcb1736d1b