commit | 7166133f8fc64cfb6e360844e12e2b3cd2d100a4 | [log] [tgz] |
---|---|---|
author | Zhijun He <zhijunhe@google.com> | Fri Jul 25 02:36:43 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 25 02:36:43 2014 +0000 |
tree | 008a480007df25784f4e21f6c1294999d65c33f3 | |
parent | 7444eac6262ac601b5331bf6bb1c4360dbedaa40 [diff] | |
parent | f7dc0d0daf28e7aafe673370059da696f82abc4d [diff] |
am 4bca50f3: am a17d4c68: am 1ecdeb58: Merge "MediaFormat: add capture rate key" into lmp-dev * commit '4bca50f38a26b5ef752d793c7b75f9ab90ce474f': MediaFormat: add capture rate key