diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-01-06 23:35:01 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-06 23:35:01 +0000 |
| commit | 565151c5641e737674037237ccfbf556a95f1454 (patch) | |
| tree | 59ae37a3e49d8e18e318cd86e4a8474826f5b1f6 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 5d6da523ee9521141275e3b35e7c03a950b0e94a (diff) | |
| parent | fb086fff3c78ac8c5f6475e454cfd3d57643a887 (diff) | |
[automerger skipped] Merge "Protect account chooser activities against overlay." into qt-dev am: 7f2257fa0f am: 683623e8b0 am: be186dc33e am: fb086fff3c -s ours
am skip reason: Change-Id I3cd5a94386f15cf60a7fe3095b00815e4a6485ae with SHA-1 7563c0bb5b is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13191817
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I82afd5bb664d4cca8264a5546d5fc78add0fee44
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions