diff options
| author | Louis Chang <louischang@google.com> | 2021-06-28 17:27:35 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-06-28 17:27:35 +0000 |
| commit | daaa10c7850289a3caaf4261730501bd099bfef8 (patch) | |
| tree | e2ef83b9a5c31b17d4b9691bea802605b74dc14e /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 419b8797d9396333cf76c4e9adcf54b8cffdd160 (diff) | |
| parent | c2af79287bc2b08388c67b730ddab72950d938e2 (diff) | |
[automerger skipped] Merge "Avoid locking profile task when it is already lock" into rvc-dev am: a40db19307 -s ours am: d9ca3e9937 -s ours am: c2af79287b -s ours
am skip reason: Merged-In Iac345471ef3badad6b9e5c0cc2873c60938663eb with SHA-1 db7d06c529 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15066851
Change-Id: I84c56d4dc92240b6e9eec976a95cdd2e0b15b35a
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions