diff options
| author | Baligh Uddin <baligh@google.com> | 2020-12-15 15:49:28 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-15 15:49:28 +0000 |
| commit | d06d55f2e05baa1bcbfae54d3acec849315c82f9 (patch) | |
| tree | e0068d9730d0745d5c808eb27fb721990a1a562b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 7b5d186c3e221b99feba49dc163787f31f0519e8 (diff) | |
| parent | 53038e17a7bf5eeba2dcd773d269f50dc9b79c7e (diff) | |
[automerger skipped] Merge "Migrate to frameworks/proto_logging/stats" into stage-aosp-master am: 9218917ebb -s ours am: 53038e17a7 -s ours
am skip reason: Change-Id I30180ec8e75f6c619dbe8492e74324d2e38d6a3f with SHA-1 4e1fe29cf0 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13206366
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5f4833a179d69784faf4c04a7b42ffe5e04b7637
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions