diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2019-05-20 09:35:31 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-20 09:35:31 -0700 |
| commit | cbcc67feef4b3c22ee5870666118e01975f9bdbb (patch) | |
| tree | ec879d353df8e73f7f27928a4021d09ab5906bf2 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 229b341af0d3e11a59a86d9cf5047f926bf85ff0 (diff) | |
| parent | 39af041253396ba58c440c4740145b1bb9a17954 (diff) | |
[automerger skipped] Merge "Add a factoryReset method to IIpMemoryStore, and freeze api." into qt-dev
am: 39af041253 -s ours
am skip reason: change_id Ia11ecd33f528d01667b1baeb8671b7213a31eef5 with SHA1 91dd063172 is in history
Change-Id: Id1b567b214f483fb322f88390f6c9f9cb39713fd
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions