tree 5245399894d22fd22de791c147a1dde19eb8ce2b
parent 33d986d9158f68941e11496d397e5c63b9ee0c47
parent f7d650e89ab1ce779dc19287edc77359dc309b5b
author Andreas Gampe <agampe@google.com> 1490743465 +0000
committer android-build-merger <android-build-merger@google.com> 1490743465 +0000

Merge "ActivityManager: Allow DiskRead for wrap.sh determination" into oc-dev
am: f7d650e89a

Change-Id: I740ffa8fe5a8a797f7c0dbce0a8af7a83248bd56