diff options
author | Lucas Dupin <dupin@google.com> | 2020-08-29 01:10:27 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-29 01:10:27 +0000 |
commit | 1d9d0f28e2fb41ef69126d5f55f361e680f60708 (patch) | |
tree | 263f1267d19ecc7928eea0469ea1b21a17d9d055 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | eafc07a70a40f0c68ca0171fa0dc8599e6a8c389 (diff) | |
parent | 536cef1b06ed9ed2a13506ce18bdaef8fd87c4b4 (diff) |
[automerger skipped] Merge "Require a more specific intent" into pi-dev am: 536cef1b06 -s ours
am skip reason: Change-Id I8f721ca659d58271880a7adbf386b270b331e55b with SHA-1 d16e86f466 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12253519
Change-Id: I1f6df7d93e70227c9e02773b4a4035c743f6f4e3
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions