OSDN Git Service

Merge "ActivityManager: Allow DiskRead for wrap.sh determination" am: cbcb388d82...
authorAndreas Gampe <agampe@google.com>
Tue, 28 Mar 2017 20:49:26 +0000 (20:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 28 Mar 2017 20:49:26 +0000 (20:49 +0000)
commitefb80cc207e3e74ff37947fcc29c915997320c7a
treebe81e827b636601c6ca0c9bd4f8181fb2c16e215
parenta4b69d3475729ea7fc01b5de496e4398d66af5eb
parent513ef1d495ba229b92ee3bf9ec26b4e5bc7c9e0e
Merge "ActivityManager: Allow DiskRead for wrap.sh determination" am: cbcb388d82 am: 9f6dc54c29
am: 513ef1d495

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