diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2019-12-11 21:48:22 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-12-11 21:48:22 +0000 |
| commit | 6442668c74815f1776126898dd17923a9008dafc (patch) | |
| tree | e7bc0bf80f1a18c20a62a78f3bf0314b737fc44d /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 8ff3c7db9f2f2a23ec38809a062fdcbc77eb8d73 (diff) | |
| parent | be2826e8dc818c8fb4cddbbf4f36ad8f5bf57ba7 (diff) | |
Merge changes from topic "am-832d01d3cd424691910400d0c94d526d" into qt-qpr1-dev
* changes:
Merge "RESTRICT AUTOMERGE TextClassifier cross-user vulnerability in direct-reply" into qt-dev am: aced288d66 am: 62a0566244
RESTRICT AUTOMERGE TextClassifier cross-user vulnerability in direct-reply am: 34e380cdd6 am: bccb8bec0a
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions