diff options
| author | Jeff Sharkey <jsharkey@google.com> | 2019-09-12 11:58:45 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-09-12 11:58:45 -0700 |
| commit | faad8c1e3e8b047c23813673e279627c359e04aa (patch) | |
| tree | c695bfca142cda8e0c1fea921f69cc24f1aee33d /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 3b136918051fd50f060e8f01099a64d8f1c84f0a (diff) | |
| parent | 497cbdf041feac6b77f5851718d95989f6a6ac49 (diff) | |
[automerger skipped] Merge "RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options." into oc-dev am: f8a2d069b4 am: f6aa7b8d8f am: 8acb456949 -s ours am: fd58ea607e -s ours am: 0b712aaf6e am: e601fa8901 am: 97a4be8898
am: 497cbdf041 -s ours
am skip reason: subject contains skip directive
Change-Id: Idfa04f104e6062f37f2f2f9ceea7a079b9df41e4
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions