tree 84f2735e1e78a76b7b9335810f9d35650c65c832
parent 1622eee2e48678b17a4668641957f09213f98905
parent d609ca7f6a48f32dcd6671f877a96e8bf1b898ed
author James Dong <jdong@google.com> 1293050291 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1293050291 -0800

Merge "Expose AMRNB/WB and AAC encoder and related file output formats - do not merge" into gingerbread