| commit | c9c32a8dcc65d861c9016b1584c2dbd29a1fab7d | [log] [tgz] |
|---|---|---|
| author | Alex Naidis <alex.naidis@linux.com> | Fri Nov 11 17:46:39 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Nov 11 17:46:39 2016 +0000 |
| tree | a36ba2ecb70600483243a808710d184c160af7cc | |
| parent | 7b5b1e315da5e19050cde608e7dac23824b24b1f [diff] | |
| parent | 07d040d3892a105b124080760a0d8767899fc1c7 [diff] |
Merge "mediacodec/mediaextractor: allow multiple Seccomp extensions" am: da4cb8cb6c am: 07d040d389 Change-Id: Ib9c9b74449fc3b7e83a82e4054a9d8d106b8b528