Merge "Fix a regression in setting oom_adj for cached processes" into qt-dev
am: 4025715b3e

Change-Id: Ic9f15ba600f34307d31c88eb11017e5a59f79ea8