diff options
| author | Chen Xu <fionaxu@google.com> | 2019-09-25 22:30:45 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-09-25 22:30:45 -0700 |
| commit | ef5cdc14371a59ed15d9fc4bb5e390faf842b2d2 (patch) | |
| tree | 3c1b7fd33ffd5e0318525d990479be98c2f7c421 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 1042cb3ea511c61af53f51f100e3bacb55aa8118 (diff) | |
| parent | b92ef484242b8bd68dced6f03dcbd96e2aae2155 (diff) | |
[automerger skipped] Merge "use @SystemAPI in AppOpsManager" am: 83fe845c8c am: 7ca0425127 am: a5d9fba763
am: b92ef48424 -s ours
am skip reason: change_id Ief8d20b62df5fcd99980182d9bb896bd82ac70e9 with SHA1 324606e459 is in history
Change-Id: Iab81f50741c2d4a5e631a018884d06e087c7c8e4
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions