tree a2beee7eb30d0945d0ab894138fa6d75a7da59e0
parent 0a4df03542e7d7aab716a60e206dceaf5da178f3
parent 1b02586f0f41d82c80619cfc0d16cd3feb5eaec7
author Jean-Michel Trivi <jmtrivi@google.com> 1378244628 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1378244629 +0000

Merge "AAC encoder: handle missing object types" into klp-dev