Narayan Kamath 56a8f8b48f 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

2014-03-31 14:10:53 +01:00

..

server

resolved conflicts for merge of 439145f0 to klp-modular-dev-plus-aosp

2014-03-31 14:10:53 +01:00