diff options
| author | Peter Wang <tpwang@google.com> | 2020-07-31 09:55:23 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-31 09:55:23 +0000 |
| commit | c5a1961f76c0106bd460dfe404ccbfb33716406c (patch) | |
| tree | f42643f5b03199c19886864a2492a67a7689682d /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 4c7aeaf577c3f133e531917cc5be851d92ddb439 (diff) | |
| parent | 68aed47728931e1d399e84992c8f158703a113ea (diff) | |
[automerger skipped] Merge "[Telephony Mainline] Rename getActiveAndHiddenSubscriptionIdList and guard with permission" am: 8ba18c0508 am: 4b6112a42c -s ours am: 68aed47728 -s ours
am skip reason: Change-Id I7f3b1f5170e032336d9b39b322c49e2b92573586 with SHA-1 ceba2adbbd is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1260749
Change-Id: Ic15254afce6f13f0553faf9ec98fc16fe9563c81
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions