tree 3f835ca3e388cfdaa3c2522adca65bdd09856222
parent 20ab26dbe54cd9ef81072c492bc466c0c4da46d8
parent 6b5d15099579c179d8e7531bb5abfb272614513a
author Andreas Huber <andih@google.com> 1366647351 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1366647352 +0000

Merge "3rd time's the charm, right? Fix another instance where MediaCodec would" into jb-mr2-dev