tree ac205f9ce8e920e040ec6650f5d974eb12470217
parent c1d8115e8a0bdaeb2b723d395b9a85a02c90c933
parent 5c61b361d1c55a93a215cfb2c325b4987f57f1c5
author James Dong <jdong@google.com> 1335315761 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1335315761 -0700

Merge "Software AVC encoder is now OMX-based"