OSDN Git Service

Merge "ActivityManager: Allow DiskRead for wrap.sh determination" into oc-dev
authorAndreas Gampe <agampe@google.com>
Tue, 28 Mar 2017 23:24:25 +0000 (23:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 28 Mar 2017 23:24:25 +0000 (23:24 +0000)
am: f7d650e89a

Change-Id: I740ffa8fe5a8a797f7c0dbce0a8af7a83248bd56


Trivial merge