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

Change-Id: Ia73f467a3ffc2d9c9baad1afd346a4178b5efab5