diff options
author | Xin Li <delphij@google.com> | 2019-08-23 22:00:19 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-08-23 22:00:19 -0700 |
commit | 6fbf8171af37d416360d83a6a73414949853d443 (patch) | |
tree | dc14a71702563d9b463f5b5bda6acb0d92f5c8e6 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
parent | 377c17d1eaea7575f9dd7ecfe00a2dff73edaf46 (diff) | |
parent | abaa7ead61615243f7c2a42180d45945242b29c5 (diff) |
[automerger skipped] Merge "DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history" into stage-aosp-master
am: abaa7ead61 -s ours
am skip reason: subject contains skip directive
Change-Id: Iaed847d118c102c5ac39c2dba6196a3fb5e80e5f
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions