am 2b6b66be: Merge "gitignore: add local.properties"

* commit '2b6b66be82c1560fd6c1f3f34def9ac0d19cda83':
  gitignore: add local.properties