Merge audio_processing changes.

R=aluebs@webrtc.org, bjornv@webrtc.org
BUG=

Review URL: https://webrtc-codereview.appspot.com/32769004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7893 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/.gitignore b/.gitignore
index 581c3bf..1082352 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,8 +48,7 @@
 /links.db
 /net
 /out
-/resources/*.*
-/resources/*/*.*
+/resources
 /talk/examples/android/bin
 /talk/examples/android/gen
 /talk/examples/android/libs