| commit | 635ccb3e56c0bce01cca27f362d5926aa1d2055a | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Tue Sep 25 08:37:35 2018 -0700 |
| committer | Nick Kralevich <nnk@google.com> | Tue Sep 25 08:38:25 2018 -0700 |
| tree | 2065ff23c788ce203554c59d92d38bf03cc09223 | |
| parent | 72ba6b43698b6488ce8f2d0a1f84282bf5d181d5 [diff] | |
| parent | 28969677754ab5bf627d79a9bc41a1a316879c4d [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: Android compiles and no obvious problems. Change-Id: I88fac5bcf4a6493672ba95daf8fd982c7b3548b5