Back out changelist 15924

[git-p4: depot-paths = "//xFace-Apollo/trunk/proto/v31gitrepo/": change = 15930]
Added offending files to .gitignore

[git-p4: depot-paths = "//xFace-Apollo/trunk/proto/v31gitrepo/": change = 15931]
Add new file would not to be integrated

[git-p4: depot-paths = "//xFace-Apollo/trunk/proto/v31gitrepo/": change = 15934]
Add app.xml to gitignore

[git-p4: depot-paths = "//xFace-Apollo/trunk/proto/v31gitrepo/": change = 15935]
Added filter to exclude temp file

[git-p4: depot-paths = "//xFace-Apollo/trunk/proto/v31gitrepo/": change = 15939]
mereged gitignore again