diff options
| author | Brad Ebinger <breadley@google.com> | 2021-02-12 20:09:07 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-12 20:09:07 +0000 |
| commit | 0b318990b31e076189ea1ed9d2e08a7fd7d3a9c2 (patch) | |
| tree | c8e79b677cbb4cc314927475466af2e04e3ffba4 /rs/java/android/renderscript/ProgramStore.java | |
| parent | 536adc2c53670f71e38fba621f964954400228b5 (diff) | |
| parent | db3dd2d54b5d59e630a340bad31c56f0c1d62764 (diff) | |
[automerger skipped] Merge "Add the ability to send the feature tags associated with IMS registration" am: dd170ee3f3 am: 79bba23280 am: db3dd2d54b -s ours
am skip reason: Change-Id Id730e5e0c9322c2a845523f3b3901f3d899c3f1c with SHA-1 571acd857b is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1584226
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id906f8233f464b294a21465513f37654e3e65bee
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions