tree 3ca900b1fcfb0f55ce3785b898f3f4fa3a554373
parent 0319699f14da8b1354dedf176c90d01de14e4344
parent 2b6b66be82c1560fd6c1f3f34def9ac0d19cda83
author Ficus Kirkpatrick <ficus@android.com> 1426122005 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426122005 +0000

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

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