commit | e6092a02c3e65130b596ede26a4038c83314bafc | [log] [tgz] |
---|---|---|
author | David Pursehouse <dpursehouse@collab.net> | Wed Apr 18 14:13:59 2018 +0200 |
committer | David Pursehouse <dpursehouse@collab.net> | Wed Apr 18 14:13:59 2018 +0200 |
tree | 4f327010d9f2b3d399354a5af227f2cb7e68b89e | |
parent | b8d43b446624627b7367347d828012bc1b16c4d8 [diff] | |
parent | 57b202df54501c05ba1c0af93973eae5d91e4ccf [diff] |
Merge branch 'stable-2.14' into stable-2.15 * stable-2.14: Format with google-java-format 1.5 Change-Id: Ifbf944373fc3ed36422fed8e1a466c84b2d3e74f