diff options
| author | Sarah Chin <sarahchin@google.com> | 2020-12-17 07:55:26 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-17 07:55:26 +0000 |
| commit | f57116d892ffa7895886bcdb310040dd184828b3 (patch) | |
| tree | c653e2a3f73689ceaede17a14f621f61dbafa434 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c08504fe7e004a82d62e67d7cc9d8460f0bba871 (diff) | |
| parent | 1df823aaf9747eaaaab324e6a6760a8ef3fd4bf6 (diff) | |
[automerger skipped] Merge "Move phone ID to extra for action provision" am: fee0474f55 am: aa95da1e19 am: 1df823aaf9 -s ours
am skip reason: Change-Id Ic4129def86949d7191d15056852718dadbd72fba with SHA-1 48eec1970f is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1530760
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2f0e1c00d00155641e8fdfde250787421dafa6b5
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions