tree 3ca900b1fcfb0f55ce3785b898f3f4fa3a554373
parent ccd9092dda9ae4d89f47515f601586c9e45989de
parent 0d17c243dba2211e9ba094c7ed2199a30bb876b2
author Ficus Kirkpatrick <ficus@android.com> 1426228373 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426228373 +0000

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

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