diff options
| author | Baligh Uddin <baligh@google.com> | 2020-12-15 15:59:03 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-15 15:59:03 +0000 |
| commit | f3fab5bcafbd9b6e7253575fa9ac85fa7cb6f225 (patch) | |
| tree | 10596f043b14b32a7dec68f611359f2f63cee60a /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | fbaa64c228cb6c6c0abb54cf0041f14c2a25cdae (diff) | |
| parent | f9933a9558dd0805267a66ae12e5a6095556df57 (diff) | |
[automerger skipped] Merge "Migrate to frameworks/proto_logging/stats" am: 474ccaacd2 -s ours am: eeb48e12d4 -s ours am: f9933a9558 -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: I7a737d0ce76b83bbc07a28b76cde4190b84856b9
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions