diff options
| author | Rubin Xu <rubinxu@google.com> | 2021-02-14 09:50:20 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-14 09:50:20 +0000 |
| commit | e39c94644749973264b7afaf595d9e5faf8ceb21 (patch) | |
| tree | 3c84b62c17a1a6773cee00cf0eae4016580ad97a /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 6777f05b2d1557e78f10cc50d43580aedc76ceb2 (diff) | |
| parent | 5ea7cd28fb8d2072da7134851f7360830f1321c8 (diff) | |
[automerger skipped] Merge "add MANAGE_CREDENTIALS appop" am: c9a8b2fa8e am: a9f241bb43 -s ours am: 5ea7cd28fb -s ours
am skip reason: Change-Id Ifd87b5e38f341db4b34bf9f61480e29e49148846 with SHA-1 d3c01ef591 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1587046
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I44df4bb309bd00dc5f8094aefdb92484fc6cdb5c
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions