Merge branch 'stable-3.1'

* stable-3.1:
  PushOne: Improve logging of lock failure

Change-Id: Ic19ffa3aef553040d3771d2c517f7cb4b9c01a21
tree: 59d70e7e231d517b68fc696f618ecaef7113b633
  1. .gitignore
  2. .mailmap
  3. .settings/
  4. BUILD
  5. LICENSE
  6. src/