commit | bff72ff3ae5edc740c48a59b147767c31a7ec438 | [log] [tgz] |
---|---|---|
author | Alex Naidis <alex.naidis@linux.com> | Fri Nov 11 17:53:40 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Nov 11 17:53:40 2016 +0000 |
tree | d079e15a7d6f5409b90b66da3eb0c398adff2042 | |
parent | be2ab2bfdad07861c213fa960faa53658cfe04dc [diff] | |
parent | c9c32a8dcc65d861c9016b1584c2dbd29a1fab7d [diff] |
Merge "mediacodec/mediaextractor: allow multiple Seccomp extensions" am: da4cb8cb6c am: 07d040d389 am: c9c32a8dcc Change-Id: Ida14853e8bd5aa68e9ac7b21d5aa81338dfb0897