| commit | dd4e264b82c80df503d4aa8024c5605fa78f32ef | [log] [tgz] |
|---|---|---|
| author | Alex Naidis <alex.naidis@linux.com> | Wed Nov 02 01:06:29 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Nov 02 01:06:29 2016 +0000 |
| tree | 3638923266e442d84c74c5f582faa4dc248d6000 | |
| parent | 2fe22807310ed70ece83f77ebacd9ef5be0da259 [diff] | |
| parent | 7f9eed98a0a0083775a2e209a4b2ec7a79dbaff9 [diff] |
Merge "mediacodec/mediaextractor: allow multiple Seccomp extensions" am: e119cfe384 am: b5f5ca9c27 am: 7f9eed98a0 Change-Id: Iba40ac6fe43ec45c4e599c039cfb6a3cac043f88