tree c028764a26eee4c015e1f2592de20196798fb8d3
parent add8b129899fc8e16cf3a63ea080876980c2a08b
parent 7b9bd40f14393bc586ed829ef1fefe0901899a1d
author Nick Kralevich <nnk@google.com> 1478057136 +0000
committer android-build-merger <android-build-merger@google.com> 1478057136 +0000

Merge "Revert "mediacodec/mediaextractor: allow multiple Seccomp extensions"" am: 712690b374 am: 68f9d0dc3b am: e40f36df56
am: 7b9bd40f14

Change-Id: I5471b7363060b98c8a247459006b9cc08af4708a