diff options
| author | Narayan Kamath <narayan@google.com> | 2014-03-31 13:54:30 +0100 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2014-03-31 14:10:53 +0100 |
| commit | 56a8f8b48ff1d0855209307b9076d6e9b348b59b (patch) | |
| tree | ed630a6b5c3effd310874e5651542b4e4ffeb766 /rs/java/android/renderscript/RenderScriptGL.java | |
| parent | 303d666f2e2b37120e0e9de206ce127e2a532026 (diff) | |
| parent | 439145f0e7701d0cf9d5934f92d9c717995511b9 (diff) | |
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
Diffstat (limited to 'rs/java/android/renderscript/RenderScriptGL.java')
0 files changed, 0 insertions, 0 deletions