From: Jean-Michel Trivi <jmtrivi@google.com>
Date: Tue, 3 Sep 2013 21:46:25 +0000 (-0700)
Subject: am 572864b9: Merge "AAC encoder: handle missing object types" into klp-dev
X-Git-Tag: android-x86-6.0-r1~1918^2~335
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=dfa989d2cd11c54a71b8b40c343a003032cf3cb9;p=android-x86%2Fframeworks-av.git

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

* commit '572864b94e7882c2d23537525c708abcacde43b0':
  AAC encoder: handle missing object types
---

dfa989d2cd11c54a71b8b40c343a003032cf3cb9