tree 40f768945ee6cac5d11fec9cfb535a2c3def7070
parent a118abebce9aa2bdd8fa4a7251875c5049082434
parent 0db280176bd3277e3256252d063f3712b1905ba9
author Andreas Huber <andih@google.com> 1330107388 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1330107388 -0800

Merge "Small fix to MediaCodec"