OSDN Git Service

Merge "ActivityManagerService: ensure updateOomAdjLocked gets called early" into...
authorTim Murray <timmurray@google.com>
Wed, 18 Apr 2018 19:00:26 +0000 (12:00 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 18 Apr 2018 19:00:26 +0000 (12:00 -0700)
commit161302416108f5eb68718970384f81bedf73ea92
treeecd6c7246d39081682a5ba6c20ab88aca179e618
parentcd018f517ef3e81d7132146754d16479827aa2f7
parent3148dbf80dd40d491d242958ecb60abb9e992c32
Merge "ActivityManagerService: ensure updateOomAdjLocked gets called early" into pi-dev
am: 3148dbf80d

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