diff options
author | vichang <vichang@google.com> | 2020-11-06 19:40:50 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-06 19:40:50 +0000 |
commit | 657b17c775cdb459f8f84ddd1a3c5b54bfe0d52b (patch) | |
tree | 58bc5bee07c13433bbeaebba1f92cd20c22c1a88 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | dfe0fe8583f1530109ae94bfc41d0265d5aba2a9 (diff) | |
parent | 44e79842385635a452dda2b983bf0f0cab5d4609 (diff) |
Merge "Move WallTime out of ZoneInfoData" am: 65d1fda8f6 am: 5dbeacab6b am: 829e31941d am: 44e7984238
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1490736
Change-Id: I9e82e9cc1091be0fb9378ce61cc76b23c3781830
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions