diff options
| author | Hall Liu <hallliu@google.com> | 2020-10-22 22:21:46 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-22 22:21:46 +0000 |
| commit | edcb833692663b7447a47c6a16bfe76dd9094ff6 (patch) | |
| tree | d71a50b589d9fb91a705cd34d54e696f86caf85a /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | a42a78e900b93a3968b192e05257715661143267 (diff) | |
| parent | 6ae0e0d4987aa8a1cce153b0cce4be7192249ce9 (diff) | |
Merge changes from topic "move-emergency-phone-update" am: 77b5c5a31b am: 4c805f8ed6 am: 6ae0e0d498
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470383
Change-Id: I56e32d36ca7bca36bbc4d3d5a9eeb02f3c8344b3
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions