tree 67a42a64eef4e70f93b7bab2154288194256684c
parent 3c823105d801fa76063c8287b1d2ea24709827ff
parent 225c2c0804e87fdb7239923f9be26d86bb553f50
author Lazar Trsic <Lazar.Trsic@imgtec.com> 1494009870 +0000
committer android-build-merger <android-build-merger@google.com> 1494009870 +0000

Merge changes from topic 'mips_seccomp_fixes' am: e6691d3470
am: 225c2c0804

Change-Id: Ibff18f07793e56d887040c0c349999ad78d2be8f