Gitiles
Code Review Sign In
LeafOS / LeafOS-Project / android_system_sepolicy / bd39081ea3be644beccc2c8bbce3422c869f3a88
commitbd39081ea3be644beccc2c8bbce3422c869f3a88[log] [tgz]
authorNick Kralevich <nnk@google.com>Fri Aug 03 17:34:04 2018 -0700
committerNick Kralevich <nnk@google.com>Fri Aug 03 17:37:32 2018 -0700
tree6f26a645cbfe900a712ed408be24b22bf2ab8583
parent19e85dfb68a5d70ec25b072bf2b94fb4371307d7 [diff]
parent601b4422ae9e4c742eacf84d6bdec5014a6f3290 [diff]
resolve merge conflicts of 601b4422ae9e4c742eacf84d6bdec5014a6f3290 to stage-aosp-master

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ic6dd370d6549c9dd1eb1e690c1c2f2fa441624b9
tree: 6f26a645cbfe900a712ed408be24b22bf2ab8583
  1. build/
  2. prebuilts/
  3. private/
  4. public/
  5. reqd_mask/
  6. tests/
  7. tools/
  8. vendor/
  9. Android.bp
  10. Android.mk
  11. CleanSpec.mk
  12. definitions.mk
  13. MODULE_LICENSE_PUBLIC_DOMAIN
  14. NOTICE
  15. OWNERS
  16. PREUPLOAD.cfg
  17. README
  18. treble_sepolicy_tests_for_release.mk