tree 3ca900b1fcfb0f55ce3785b898f3f4fa3a554373
parent 9ac6e90f2b36e76e4860cae7e6ab4458b9a49189
parent 6c59bc4b15608271298aab6cc3b332d7099dc39f
author Ficus Kirkpatrick <ficus@android.com> 1426118861 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1426118861 +0000

Merge "gitignore: add local.properties"