tree 7b473b7b29a77ee70dd423391b4e2db43a4c6be4
parent 4ba8d8b5bfde94c37ef8c9470a98c272814c8ebf
parent b19825012eb159ad459c7c690b8ed7f7b4653c9c
author Jeff Vander Stoep <jeffv@google.com> 1490645389 +0000
committer android-build-merger <android-build-merger@google.com> 1490645389 +0000

Merge "Move selinux policy build decisions to sepolicy Makefile" am: 784c851785
am: b19825012e

Change-Id: I78d6d58f31e5e7c77178b949e629c99257c90ea5