| commit | 1633b76f8a15ccc0de5d40ce8ca2848059abc66a | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Fri Jan 25 08:29:25 2019 -0800 |
| committer | Nick Kralevich <nnk@google.com> | Fri Jan 25 08:29:25 2019 -0800 |
| tree | f481f69e678bcf9645e069f73ac546ecf44ef5e1 | |
| parent | 5fa62dd3182c6f6350b559017480b441f289b78c [diff] | |
| parent | ae11352bde6f06e90c1a16aa88ec34134326b4cd [diff] |
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 boots and no obvious problems. Change-Id: I6beff804808e92d1002ead226c7d5c702f373cdc