diff options
| author | Baligh Uddin <baligh@google.com> | 2020-12-15 15:40:59 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-15 15:40:59 +0000 |
| commit | eeb48e12d4126dc5c0e06c73cd1f6447164cf020 (patch) | |
| tree | 278fe016d6d6273b6b7afcc05b4707a5dea26869 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | ff4f8415e1b959f7fc1ace0b5843e55977fcb172 (diff) | |
| parent | 474ccaacd299dcea0726d14f905f76a80302c9be (diff) | |
[automerger skipped] Merge "Migrate to frameworks/proto_logging/stats" am: 474ccaacd2 -s ours
am skip reason: Change-Id Id85494f7f40a0201061e74fbf3f08f70a632a62c with SHA-1 73802a1802 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527001
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8f47d8a6b9204d784742f44181505f4e6713b413
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions