tree 71e4c847f0805c9c2a22c74e55d314b7753ee2da
parent 91345d646969815a80c8c40dc3b48b10566c2d0a
parent f1851a118501975f29ae9053ace97954daaca554
author Lazar Trsic <Lazar.Trsic@imgtec.com> 1494010201 +0000
committer android-build-merger <android-build-merger@google.com> 1494010201 +0000

Merge changes from topic 'mips_seccomp_fixes' am: e6691d3470 am: 225c2c0804 am: 65a03b0ab9
am: f1851a1185

Change-Id: Id47c5db8d576afeadddbb47f47b16ca4251f4524