tree 104a4a6d9f6ced74c8a439fd55928fb697a2fe06
parent 8ab6120f70d01c18a0d4fc3226f7172ee3cf5a14
parent 84490212625a372bdc3d463ce94f189d76b8997c
author Tina Zhou <tinazh@google.com> 1476402462 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1476402462 +0000

Merge "Add frame-rate requirement to MediaFormat used to find matched encoder" into marshmallow-cts-dev