commit | 3dc14754c68d8318c6af931b86fbc9385c6ffa89 | [log] [tgz] |
---|---|---|
author | Ficus Kirkpatrick <ficus@android.com> | Fri Mar 13 06:32:53 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 13 06:32:53 2015 +0000 |
tree | 3ca900b1fcfb0f55ce3785b898f3f4fa3a554373 | |
parent | ccd9092dda9ae4d89f47515f601586c9e45989de [diff] | |
parent | 0d17c243dba2211e9ba094c7ed2199a30bb876b2 [diff] |
am 0d17c243: am 2b6b66be: Merge "gitignore: add local.properties" * commit '0d17c243dba2211e9ba094c7ed2199a30bb876b2': gitignore: add local.properties