Merge branch 'stable-3.1'

* stable-3.1:
  Prevent persistent task listing interruptions on IOExceptions

Change-Id: Iaa7a6e354b629fac9afdb8bf18074a4662b61541
tree: 34c6625a2e924a90baa7a82b847b30773541e328
  1. .gitignore
  2. .mailmap
  3. .settings/
  4. BUILD
  5. LICENSE
  6. src/