diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-09-02 20:36:13 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-02 20:36:13 +0000 |
| commit | 7c057b4ec5798cd3892c98a2c44d49c39f486e41 (patch) | |
| tree | 7cd49368d5c807f0230d697672a27df038af1f0d /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 0b9e08618434b9e265cdf7e88ce2d873b3ac5dbb (diff) | |
| parent | ce81c5a4202473c127b138be0dde0f35cd85d626 (diff) | |
[automerger skipped] Merge "Fix NavigationBarColorTest" into stage-aosp-master am: cf7c807eea -s ours am: 14aac87b1a -s ours am: ce81c5a420 -s ours
am skip reason: Change-Id I68db516c91da69e0f4dcbdfab6d6a757c4cdc75b with SHA-1 588fa46cf4 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12513856
Change-Id: I62edbf328ab9068a9a50216970a6f71aec320f12
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions