diff options
| author | Nick Kralevich <nnk@google.com> | 2015-08-11 05:39:22 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-11 05:39:22 +0000 |
| commit | c94caa14f8acb9f2f1010c34e7a40a51bf17b63b (patch) | |
| tree | 88c67d2b853aea7f799a95255013fc925bbc54b6 /services/audiopolicy/managerdefault | |
| parent | 9195d57f3e6cf5339531944469293e1188a7947f (diff) | |
| parent | b07c4a8d7f6c0ce52e5c63142e39e8c39fcaee35 (diff) | |
| download | frameworks_av-c94caa14f8acb9f2f1010c34e7a40a51bf17b63b.zip frameworks_av-c94caa14f8acb9f2f1010c34e7a40a51bf17b63b.tar.gz frameworks_av-c94caa14f8acb9f2f1010c34e7a40a51bf17b63b.tar.bz2 | |
am b07c4a8d: am f86b266c: am 2c181bec: am 7f6a36d2: am b6131acd: am 94f8150b: resolved conflicts for merge of c86eae32 to klp-modular-dev
* commit 'b07c4a8d7f6c0ce52e5c63142e39e8c39fcaee35':
MPEG4Extractor.cpp: Add check for size == SIZE_MAX
Diffstat (limited to 'services/audiopolicy/managerdefault')
0 files changed, 0 insertions, 0 deletions