diff options
| author | Sarah Chin <sarahchin@google.com> | 2020-12-17 08:49:42 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-17 08:49:42 +0000 |
| commit | 818939cd1786d2ef6e6b04f68ff326e328af70bc (patch) | |
| tree | acfa7235638cfa8585ca67da3f963aa08c48f501 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 135b73258d452e0dda3e901857307b64d2692fbf (diff) | |
| parent | 08f0cfa33bce7c4ec3e72ec7a840778107336ea7 (diff) | |
[automerger skipped] Merge "Move phone ID to extra for action provision" into rvc-qpr-dev am: 0d094ad38e -s ours am: 08f0cfa33b -s ours
am skip reason: Change-Id Ic4129def86949d7191d15056852718dadbd72fba with SHA-1 48eec1970f is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13129115
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I55270aa3b837bea1e2c58603b762c7f10aae052c
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions