OSDN Git Service

Merge "Add API to get a uid's current importance." into oc-dev
authorDianne Hackborn <hackbod@google.com>
Wed, 12 Apr 2017 21:11:40 +0000 (21:11 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 12 Apr 2017 21:11:46 +0000 (21:11 +0000)
1  2 
api/system-current.txt
api/test-current.txt
core/java/android/app/ActivityManager.java
core/java/android/app/IActivityManager.aidl
services/core/java/com/android/server/am/ActivityManagerService.java

Simple merge
Simple merge