tree feb018e861b2dc245c7f852c89af3239f9c50cb6
parent 7882d32446b98ff7a2061e437a507979c4e0f661
parent 67387a3510c2f6a2c68393ade2bf9115cb29e8e7
author Paul Lawrence <paullawrence@google.com> 1478531842 +0000
committer android-build-merger <android-build-merger@google.com> 1478531842 +0000

Merge "Fix selinux warning on tracefs systems" am: 0ad600bdc6 am: 3915012a46
am: 67387a3510

Change-Id: I0aa3c01e3b9ed5981dccbb2fcff1e7ea5fa96c0e