diff options
| author | Nazanin Bakhshi <nazaninb@google.com> | 2019-07-01 19:23:05 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-07-01 19:23:05 -0700 |
| commit | 9115563f9cdafbed6a3125d69c6a5569eea06178 (patch) | |
| tree | f3054b81aa81dcf8114c23e53314b6aeaec70a64 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 88a46cca4b830661f5461deed67cf8a911f97c6f (diff) | |
| parent | 642d861c941a4c5957ee50a46a0b1bd66c931f20 (diff) | |
[automerger skipped] Merge "Add device identifier permission checks to TelephonyPermissions" am: 1ca89a995b am: 43f45f94d0 -s ours am: b3a7b953bc -s ours
am: 642d861c94 -s ours
am skip reason: change_id I3c82c53ec89cd17b34a61166ccc9e9747388efac with SHA1 6d20d75e9e is in history
Change-Id: Iafdf567a92fe163ecc3a73ddb1948f92dce08e87
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions