Merge branch 'stable-3.1'

* stable-3.1:
  Make persistent task keys stable

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