tree 42707be7447efb55823bc45acbba05f38bcd218e
parent 5157b1e8355ef3176536e4de793ec1b7679b7ad9
parent f3bd1972e039c6ded5154db715e5a32f1813a239
author Marco Nelissen <marcone@google.com> 1365787251 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1365787251 +0000

Merge "Fix MediaCodec.flush()" into jb-mr2-dev