diff options
author | Peter Wang <tpwang@google.com> | 2021-01-21 03:08:06 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-21 03:08:06 +0000 |
commit | 672cfddebe159251ac5f8aca109c739708f40a7f (patch) | |
tree | 07772597511a0c2593fa711901c1775cbeb55230 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 5bb554490901e14aef3266558a58c8bce8be653c (diff) | |
parent | 83283caf84bc9c72e1a0810ea2dca1a6451e292b (diff) |
[automerger skipped] Merge "Add an API for LPA (SIM Manager) to bring up pages related to managing SIM profiles." am: 795478a020 am: 5c0c899770 am: 83283caf84 -s ours
am skip reason: Change-Id I8a2c4e86cb3ffd6ef0dac03ec2e4968839202e7d with SHA-1 74f0d22468 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552855
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1b0aecb321fca150d6d6e573bc0b8028fe321281
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions