Update .gitignore
(cherry picked from commit 66ee1ad65f7dc8f674f40d62d747abd938592458)
Merge remote-tracking branch 'origin/master'
Update SwipeDismissListViewTouchListener