diff options
| author | James Mattis <jmattis@google.com> | 2019-11-15 15:51:21 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-11-15 15:51:21 -0800 |
| commit | e599d6788db92895a603884892f99a6c7135293d (patch) | |
| tree | e0a85c8385587d9f95822d9c315ade6ea4bb65bf /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 12c4f184506a461e2419bea6e04a962cf4d3a014 (diff) | |
| parent | 49960bdd5f83a99f0fb24144c22d4030197555ec (diff) | |
[automerger skipped] Merge "Marking SoftApCallback methods as SystemAPI" am: 8295ffc5af am: 179ed7d640
am: 49960bdd5f -s ours
am skip reason: change_id I22b5029a8dbd7a50ad6faf0bb3b15269af839956 with SHA1 80c86d5c08 is in history
Change-Id: I991e8991b4a82c6363f7cc45ad419725b463e6ab
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions