| commit | 97f1ad659152558eb6d8118bed78bffb6f156608 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Tue Jun 11 09:07:03 2019 -0700 |
| committer | Nick Kralevich <nnk@google.com> | Tue Jun 11 09:07:03 2019 -0700 |
| tree | a3553bdd9548dec1c381069b3ddb0116de19bb2e | |
| parent | e690b03a93580f162feea34dce9bf16191974271 [diff] | |
| parent | c758ac1ddf3ec7529bf530cbd6e06bdd219a8805 [diff] |
Merge remote-tracking branch 'aosp/upstream-master' into mymege 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 lunch && make -j repo upload . Test: compiles and boots Change-Id: Ia2dbf92e3127aa779bec3c46f171d3ef6c1cbfe5