diff options
| author | Yan Yan <evitayan@google.com> | 2021-03-02 00:12:32 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-02 00:12:32 +0000 |
| commit | 768da4ffc04798f5540cad7ee1d5261d345fafa9 (patch) | |
| tree | fb51f18c8e4d219e99acb87513aec5f91e323a87 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | bcbfb511660a115e5614b7ab8b99f5cc38076bb5 (diff) | |
| parent | 029885f8c792a34288a0f7e1d9ca3b9b9641aed3 (diff) | |
Merge "Support converting IkeTrafficSelector to/from PersistableBundle" am: 6a6a6349a7 am: 029885f8c7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1597156
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I413a7801db110980b3da7147b2ce29c867a1d2fc
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions