diff options
author | Jeff Vander Stoep <jeffv@google.com> | 2017-04-12 12:31:22 -0700 |
---|---|---|
committer | Jeff Vander Stoep <jeffv@google.com> | 2017-04-12 14:45:12 -0700 |
commit | 2cc30d6029d52690bf01b2dc4a04d8af3a49261f (patch) | |
tree | 72873d62261c7dac119db23e809208a5ac375b64 /libselinux/src/getfilecon.c | |
parent | 43a9c969aa60115c5716c4120ee7d8d69d5d86a8 (diff) | |
parent | 64afa1aff1cd610d2493f780e2a44b551f668b84 (diff) | |
download | android_external_selinux-2cc30d6029d52690bf01b2dc4a04d8af3a49261f.tar.gz android_external_selinux-2cc30d6029d52690bf01b2dc4a04d8af3a49261f.tar.bz2 android_external_selinux-2cc30d6029d52690bf01b2dc4a04d8af3a49261f.zip |
Merge remote-tracking branch 'aosp/upstream-master' into mymerge
Bug: 36508258
Test: build and boot Marlin.
Change-Id: Ic5f92ad304dca23ddbfaaffd86489f3a556f9a1e
Diffstat (limited to 'libselinux/src/getfilecon.c')
0 files changed, 0 insertions, 0 deletions