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