Elliott Hughes d36d82a117 resolve merge conflicts of 7206a3b38c to oc-dev-plus-aosp ...

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ib00dfc08b1ca7223d49b18fceab780c5dbec0d7e

2017-04-03 10:48:05 -07:00

..

board

Remove marlin/sailfish specific sepolicy

2017-03-30 14:25:41 +09:00

product

resolve merge conflicts of 7206a3b38c to oc-dev-plus-aosp

2017-04-03 10:48:05 -07:00