Commits

Stephen Smalley  committed b486a57

Revert "Settings change merged to AOSP master, drop our project."

This reverts commit aada08324053224382e614e921a7c16522efb9bb.
Settings restored for AppOps support.

Conflicts:
local_manifest.xml

  • Participants
  • Parent commits e0cf960

Comments (0)

Files changed (1)

File local_manifest.xml

   <remove-project name="platform/system/core"/>
   <project path="system/core" remote="bitbucket" name="system-core" revision="seandroid" />
 
+  <remove-project name="platform/packages/apps/Settings"/>
+  <project path="packages/apps/Settings" remote="bitbucket" name="packages-apps-settings" revision="seandroid"/>
+
   <remove-project name="device/samsung/tuna"/>
   <project path="device/samsung/tuna" remote="bitbucket" name="device-samsung-tuna" revision="seandroid" />