| commit | e367b704c004f89adc593cb6869974cfdf83b3fa | [log] [tgz] |
|---|---|---|
| author | Ronghua Wu <ronghuawu@google.com> | Thu Aug 27 14:17:41 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:17:41 2015 +0000 |
| tree | 3afa17a64581c4f6d7cb596fcae18b2bf7c3d029 | |
| parent | 06d2043ba6891bca4ec3e72a6bde892cc8409e5c [diff] | |
| parent | 0df967c5f71171abfef1873c767a1ea68c210b48 [diff] |
am 0df967c5: am b10d216f: (-s ours) am 374e7a89: Merge "Encoder: Fixed an issue in handling FPS greater than 60" into mnc-dev * commit '0df967c5f71171abfef1873c767a1ea68c210b48':