OSDN Git Service

Merge "Fix for incorrect cycle evaluation in computeOomAdj DO NOT MERGE" into pi-dev
authorAmith Yamasani <yamasani@google.com>
Wed, 18 Jul 2018 01:13:38 +0000 (18:13 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 18 Jul 2018 01:13:38 +0000 (18:13 -0700)
commit39935ebb5247d136f428af17738200acbfb7a994
treedd4ecb7dbb6cbb53a10ab2ef4abfc412da16e47e
parent72e042db9df347cc84ec819fbc28bad69232088e
parent9d77aaec850b54e3bc1657025fe87399b89c8ba1
Merge "Fix for incorrect cycle evaluation in computeOomAdj DO NOT MERGE" into pi-dev
am: 9d77aaec85

Change-Id: Ie4e65d42c44a2a45418f5bd27155efc6c4869276
services/core/java/com/android/server/am/ActivityManagerService.java