tree df1bae17d7e2b832d0090a4e775edc0a333b37f4
parent 5182337fcf848ca410ae61397752dfb0995067ef
parent 7c5abbb0e1b20df4b265a08a8560899f637f9b44
author Marco Nelissen <marcone@google.com> 1366058553 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1366058553 +0000

Merge "Fix AAC decoder reconfiguration" into jb-mr2-dev