summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJean-Michel Trivi <jmtrivi@google.com>2013-09-03 14:46:25 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-09-03 14:46:25 -0700
commitdfa989d2cd11c54a71b8b40c343a003032cf3cb9 (patch)
treeb00b3d9c6e4150938b7a5cefb6d20b294a0c3269 /include
parent68f193f3deab9ce579ab7a43d079725ba6e4880e (diff)
parent572864b94e7882c2d23537525c708abcacde43b0 (diff)
downloadframeworks_av-dfa989d2cd11c54a71b8b40c343a003032cf3cb9.zip
frameworks_av-dfa989d2cd11c54a71b8b40c343a003032cf3cb9.tar.gz
frameworks_av-dfa989d2cd11c54a71b8b40c343a003032cf3cb9.tar.bz2
am 572864b9: Merge "AAC encoder: handle missing object types" into klp-dev
* commit '572864b94e7882c2d23537525c708abcacde43b0': AAC encoder: handle missing object types
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions