diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2020-12-02 10:34:34 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-02 10:34:34 +0000 |
| commit | 24ea4022726a7b6ca8a0d26f9f4395c428f7f92c (patch) | |
| tree | ce0a7ff9d5d62d89159e45d8c16b16fe094fd686 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 53f60a1e1837377f4d5e588eec9b2d9686fbd766 (diff) | |
| parent | 41e94b11c8e797e85190b02e8c5dbd5263eec409 (diff) | |
Merge "Add ConnectivityManager.TYPE_PROXY to SystemApi" am: 71cd774f68 am: 41e94b11c8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1512885
Change-Id: Ib842dd5097904e3ce9da1cb1ceff0325031dfd79
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions