diff options
| author | Daniel Sandler <dsandler@android.com> | 2021-06-10 14:53:21 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-06-10 14:53:21 +0000 |
| commit | 0f735a7bb38d9793c8305affc47f9d27632f728b (patch) | |
| tree | 006e60cf5c8173518908e11163435e76f2f87e1f /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 665a84d29d17a289f56b540781de35be0198c454 (diff) | |
| parent | 1f0a6621ad9c6862c823db11e407b26bdc5144b9 (diff) | |
[automerger skipped] Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into qt-dev am: 7e742dca13 am: 1f0a6621ad -s ours
am skip reason: Merged-In Ie486396fd7328edf8ca0912df92524bb82a1fb7f with SHA-1 9c8b1512a5 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14673294
Change-Id: Ib85e3b41e02f79527416a455d3e57eecd0b7b5a9
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions