diff options
| author | Nazanin Bakhshi <nazaninb@google.com> | 2019-07-01 18:16:20 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-07-01 18:16:20 -0700 |
| commit | b3a7b953bc0864509afcc71156c04ee626595fe1 (patch) | |
| tree | 8d6fd00d13df30673cc44a2989901718e9e1cd68 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | d961980369386e65f475232a07f3cd66ce9399c6 (diff) | |
| parent | 43f45f94d0a4299bf3f4e41e02ce945b6f7fdcc1 (diff) | |
[automerger skipped] Merge "Add device identifier permission checks to TelephonyPermissions" am: 1ca89a995b
am: 43f45f94d0 -s ours
am skip reason: change_id I3c82c53ec89cd17b34a61166ccc9e9747388efac with SHA1 6d20d75e9e is in history
Change-Id: I0b17cc6a19f2f30f9c77642a1c812b99e6a788c2
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions