tree c36c6d80798dbceb652b0db93d9d64268a5e351a
parent 477def1d4216f82bdfe58525131db88b384fc5a5
parent 438e4f62adf5094d7125f83dcc517d7502e85b9f
author James Dong <jdong@google.com> 1277398008 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1277398008 -0700

Merge "Fixed the software AAC encoder" into gingerbread