diff options
| author | Hui Wang <huiwang@google.com> | 2021-03-24 22:19:11 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-24 22:19:11 +0000 |
| commit | cfae37d992ca1d462c48c0fc4c00fa77eb4f3470 (patch) | |
| tree | f40f91a85e37c73054e2032cb67d646af763521e /rs/java/android/renderscript/ProgramFragment.java | |
| parent | 00dcff88e84b1b445215e7c9d8cfed2a30ee7af9 (diff) | |
| parent | 85badc52ca80592cf2916dd0839e7123c9123644 (diff) | |
[automerger skipped] Merge "Integrate RCS provisioning updates into SipTransport" am: 11149deba4 am: 2d9c051d65 am: 85badc52ca -s ours
am skip reason: skip tag Change-Id Ifabbe6a4c4cccef85c5c1b43fcb7876bad33e226 with SHA-1 840afdd0bd is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1651543
Change-Id: I3458ec299fca2b7aaac80af05d41c740fdc846cf
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragment.java')
0 files changed, 0 insertions, 0 deletions