diff options
| author | Nick Kralevich <nnk@google.com> | 2019-02-26 09:55:25 -0800 |
|---|---|---|
| committer | Nick Kralevich <nnk@google.com> | 2019-02-26 09:55:25 -0800 |
| commit | 65c6846e1a2548d8567e855f049256691e1320df (patch) | |
| tree | 535eb8afd81e80be53b38d0db1a046570fc7abd2 /libselinux/src/label_internal.h | |
| parent | 28cf7ea80d067f070453d47a9a1881517f14d433 (diff) | |
| parent | 478c745d82d7c8bb4b15209408335a97891dc4ae (diff) | |
| download | android_external_selinux-65c6846e1a2548d8567e855f049256691e1320df.tar.gz android_external_selinux-65c6846e1a2548d8567e855f049256691e1320df.tar.bz2 android_external_selinux-65c6846e1a2548d8567e855f049256691e1320df.zip | |
Merge remote-tracking branch 'aosp/upstream-master' into mymerge
This really isn't needed, as we just rebased 5 days ago. However, I
wanted to minimize the diff in case anyone happens to look at
b/126376007 today.
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 boots and no obvious problems.
Bug: 126376007
Change-Id: I290900ec5285ca98212b90d0ac536da9d27b16c9
Diffstat (limited to 'libselinux/src/label_internal.h')
0 files changed, 0 insertions, 0 deletions