tree bf9b33b402b46d78f010663264ef6e4f27135537
parent f42d493697647d3dcf8b32fe7581302fe5f1b512
parent 3392ce4a04b117b77c58f41e9ac0e130327e9431
author Ronghua Wu <ronghuawu@google.com> 1428696602 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1428696604 +0000

Merge "media: add MediaFormat.KEY_OPERATING_RATE."