diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-28 01:12:36 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-08-28 01:12:36 +0000 |
| commit | b4d48ef86fd81c330b3c50e509ceadbcfa6e3228 (patch) | |
| tree | 6c30a90efcbc2b6862555de8d8f38452839ae997 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | aad1e8d73ce087559b7203a5bde7219ef4eeae0e (diff) | |
| parent | 4e57d56e2ac04d5cb0ad8d0524f99b6435ab446c (diff) | |
Merge changes from topic "am-6f770425941c4b038ea830d1a049926f" into rvc-d1-dev-plus-aosp
* changes:
[automerger skipped] Merge "DO NOT MERGE - Only autoVerify at install for new hosts" into oc-dev am: 1747090bf8 am: ee631a72c3 -s ours am: 3bc3d3e0a3 -s ours am: d1027116ca -s ours am: 629705299c am: 2f50ed96f0 -s ours am: 75a8d3033e -s ours am: 9cb0c58fb0 -s ours
[automerger skipped] DO NOT MERGE - Only autoVerify at install for new hosts am: 90b716a442 am: c41fdb42a4 -s ours am: d6765ff93c -s ours am: 974929a9b1 -s ours am: 1f14278834 am: 53aea4a3ad -s ours am: 4780dc3cb3 -s ours am: 12dc02e15b -s ours
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions