| commit | 68ea5ce1fef8791d83b6362d35d11448924e8818 | [log] [tgz] |
|---|---|---|
| author | Jeff Vander Stoep <jeffv@google.com> | Wed Nov 22 09:31:25 2017 -0800 |
| committer | Jeffrey Vander Stoep <jeffv@google.com> | Wed Nov 22 20:07:53 2017 +0000 |
| tree | dbdfc3640888e270dcbcac34cab16ee83a1318f6 | |
| parent | 122c68c8625e2ae6e386d8b6396088f7bd00be4c [diff] | |
| parent | 2d49a4b41c6ecbcf254e6045f2e01f677ad58ffe [diff] |
Merge remote-tracking branch 'aosp/upstream-master' into mymerge
Bug: 69566734
Bug: 68133473
Test: build and boot aosp_marlin
Test: sepolicy-analyze <aosp_taimen policy> attributes -l
Verify socket_between_core_and_vendor_violators is still in policy
Change-Id: Id77bfc049e74cc7041a9876b06347b08fa5eeaf8