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

* commit '0d17c243dba2211e9ba094c7ed2199a30bb876b2':
  gitignore: add local.properties