diff options
| author | Nick Kralevich <nnk@google.com> | 2019-02-21 12:56:14 -0800 |
|---|---|---|
| committer | Nick Kralevich <nnk@google.com> | 2019-02-21 12:56:14 -0800 |
| commit | 28cf7ea80d067f070453d47a9a1881517f14d433 (patch) | |
| tree | a69077225ab87d346497741aa8f21ffd2e6f6d92 /libselinux/src/label_internal.h | |
| parent | 13030b2fd3cc59d77d953455827b9f64da66e0da (diff) | |
| parent | 6b89b1f9c1d8ce94c48c242955ef10f1f2904962 (diff) | |
| download | android_external_selinux-28cf7ea80d067f070453d47a9a1881517f14d433.tar.gz android_external_selinux-28cf7ea80d067f070453d47a9a1881517f14d433.tar.bz2 android_external_selinux-28cf7ea80d067f070453d47a9a1881517f14d433.zip | |
perfcrastination: Merge remote-tracking branch 'aosp/upstream-master' into mymerge
Followed the following steps:
# In repo client
cd external/selinux
repo sync .
repo start mymerge .
git merge aosp/upstream-master --no-ff # resolve any conflicts
repo upload .
Test: device compiles and boots
Change-Id: I2b5b1a201d43ee94fc909dd8bca5595bc7f0e522
Diffstat (limited to 'libselinux/src/label_internal.h')
0 files changed, 0 insertions, 0 deletions