tree ed630a6b5c3effd310874e5651542b4e4ffeb766
parent 303d666f2e2b37120e0e9de206ce127e2a532026
parent 439145f0e7701d0cf9d5934f92d9c717995511b9
author Narayan Kamath <narayan@google.com> 1396270470 +0100
committer Narayan Kamath <narayan@google.com> 1396271453 +0100

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