commit | e40f36df56cd1ad2fca7fcfeaf7bec50c69d2060 | [log] [tgz] |
---|---|---|
author | Nick Kralevich <nnk@google.com> | Wed Nov 02 03:20:19 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Nov 02 03:20:19 2016 +0000 |
tree | f4fa835178881100d1d08f298b8a5ef63a9c9ef8 | |
parent | 7f9eed98a0a0083775a2e209a4b2ec7a79dbaff9 [diff] | |
parent | 68f9d0dc3b25c69eecccc9487319dd3343f0790b [diff] |
Merge "Revert "mediacodec/mediaextractor: allow multiple Seccomp extensions"" am: 712690b374 am: 68f9d0dc3b Change-Id: I365afda0f80b5037a2f5fd2cf27f73195dc42a49