diff options
| author | Wei Jia <wjia@google.com> | 2015-06-13 01:03:57 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-13 01:03:57 +0000 |
| commit | efabeff16f479924547136bb88ee295fea718183 (patch) | |
| tree | 3a8073f158801b80428242fc550123278d7ee188 /services/audioflinger | |
| parent | 72af342e74a85485df34c21472f73bdbf12600ac (diff) | |
| parent | 7d3be41436e91a1d79b3a38c651bcd0d2c221f6d (diff) | |
| download | frameworks_av-efabeff16f479924547136bb88ee295fea718183.zip frameworks_av-efabeff16f479924547136bb88ee295fea718183.tar.gz frameworks_av-efabeff16f479924547136bb88ee295fea718183.tar.bz2 | |
am 7d3be414: am f475f6c0: am e168bdd2: am f19acf48: am 66b91b34: am e6382cb0: am 115e995c: resolved conflicts for merge of 1f44d837 to lmp-dev
* commit '7d3be41436e91a1d79b3a38c651bcd0d2c221f6d':
Fix integer overflow when handling MPEG4 tx3g atom
Diffstat (limited to 'services/audioflinger')
0 files changed, 0 insertions, 0 deletions