Commits
Narayan Kamath authored 56a8f8b48ffM
resolved conflicts for merge of 439145f0 to klp-modular-dev-plus-aosp This isn't a straightforward conflict resolution. This code has changed significantly. mSafeMode is now a flag on the activity manager service, and is set when SystemServer calls enterSafeMode. Change-Id: I1e8ff524566c5e44bb6bf3b138cdebb70004aca3
Showing diff to303d666f2e2