diff options
author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-11 10:25:01 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-11 10:25:01 +0000 |
commit | 75f0791a4fa4911d7428d3fed0a03a875412ba63 (patch) | |
tree | 9c1f5e98951a604a9958a7d0ff4917c11b9bf2a6 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 85e70101386ea380e29aed12d449f9f89f25d6e1 (diff) | |
parent | 8e258a182bb3d21390c2dc14f22d1cef7da37ddb (diff) |
[automerger skipped] RESTRICT AUTOMERGE Use consistent calling uid and package in navigateUpTo am: 1c9bf5cc54 am: 2e254bb81e -s ours am: fb0419e165 -s ours am: 0361dab3d8 -s ours am: 8e258a182b -s ours
am skip reason: Change-Id I60732f430256d37cb926d08d093581f051c4afed with SHA-1 da78af4d66 is in history
Change-Id: I906a47317135f61899f3f40b20d32cb25e0b0152
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions