diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-15 19:29:46 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-15 19:29:46 +0000 |
| commit | 2679b1ed11f991ddb9c10ab1f2aac3612ebe9160 (patch) | |
| tree | b8476a04738d7a5ee6308fdfe4c3f64e487ec1c1 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 73287d1ab3b64fe503deab03ebc3b681e5269d2c (diff) | |
| parent | cb5b9589173b2d98fb8795c94bc0e7affb5b01ac (diff) | |
[automerger skipped] Merge "Cleanup ITelephony in TelephonyPermissions with new System API. This method is used by Telephony Module for permission checking." am: 725c54065d am: 3a6b29da40 am: cb5b958917 -s ours
am skip reason: Change-Id Ie706e05e6a69e570331c1fe08a8df9677e0d9c8a with SHA-1 145294168f is in history
Change-Id: I2a3e0092171dc7dc7aaecf2e9cc9aa4ef52b15b3
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions