Merge "Better default AAC DRC setting" into jb-mr2-dev

author Jean-Michel Trivi <jmtrivi@google.com>

Tue, 16 Apr 2013 15:42:00 +0000 (15:42 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Tue, 16 Apr 2013 15:42:00 +0000 (15:42 +0000)
author Jean-Michel Trivi <jmtrivi@google.com>
Tue, 16 Apr 2013 15:42:00 +0000 (15:42 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 16 Apr 2013 15:42:00 +0000 (15:42 +0000)
diff --cc media/libstagefright/codecs/aacdec/SoftAAC2.cpp
Simple merge
author	Jean-Michel Trivi <jmtrivi@google.com>
	Tue, 16 Apr 2013 15:42:00 +0000 (15:42 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 16 Apr 2013 15:42:00 +0000 (15:42 +0000)