diff options
| author | Ronghua Wu <ronghuawu@google.com> | 2015-07-29 02:12:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-29 02:12:38 +0000 |
| commit | 7c86f4df7117df592ec595138af39cffb8ae688d (patch) | |
| tree | 50f114c57c62c3fb7a85f290ec322bd6935fbfea /tools/aapt2/diff/Diff.cpp | |
| parent | f99b8dc484f7d1b1bc3610833ee909e89fbd9d6c (diff) | |
| parent | cdd81636e1938e7c9053648a13e6ccebd2ba9d2f (diff) | |
am cdd81636: am 29bac774: am 9090d3c3: am 02022b70: Merge "media: fix estimateFrameRatesFor to use correct ratio" into mnc-dev
* commit 'cdd81636e1938e7c9053648a13e6ccebd2ba9d2f':
media: fix estimateFrameRatesFor to use correct ratio
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions