diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-08-27 09:45:40 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-27 09:45:40 +0000 |
| commit | d864038ca782566127f216f03160d4de6a98f5ff (patch) | |
| tree | 31b544bb1465a1b20b3791b6beebca8284aa94fc /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 112bc166fd0488d91478da3fab1f0176b8939ed6 (diff) | |
| parent | e3eb8abd49a0d8f62d6b3a83fd4e83b5bd5b866e (diff) | |
[automerger skipped] Merge "Fix usage of the wrong lock in PackageManager (mLock instead of mSettings)" into rvc-qpr-dev am: 308b772c1f am: e3eb8abd49 -s ours
am skip reason: Change-Id Ie822d8f2267dcb8ce382e91ab5de365a4e0ce19f with SHA-1 1690689bc4 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12453454
Change-Id: Ie0b36349d035eb3cd421e567931fcc23e1204888
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions