diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-21 23:08:41 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-01-21 23:08:41 +0000 |
| commit | b8349d34c2e29b747af32ad0ce5629505d9ea336 (patch) | |
| tree | 22f78ab3a447a3efb4f853d5e53956938b88ef11 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | f8e1ebb616a1fc914ed2a356e15b67279aa9794c (diff) | |
| parent | 7a606738dc503095c74b634563be6ec9620a7e7e (diff) | |
Merge changes from topic "am-9f1f3a1f2cf946f0b2fe74dbf8e9b4d1" into rvc-qpr-dev-plus-aosp
* changes:
Merge "DO NOT MERGE: Do not inject mock location to chipset" into rvc-qpr-dev am: 94b4830cb8
DO NOT MERGE: Do not inject mock location to chipset am: abccd8f7bc
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions