diff options
author | Lorenzo Colitti <lorenzo@google.com> | 2019-06-13 21:49:22 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-06-13 21:49:22 -0700 |
commit | 2d2d35427c361b25a56a44cdba674b1b6dd7f535 (patch) | |
tree | 1f42197a40170e9273686e4b93e8b41afebb6457 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 24c57b6a70bd56f3c166ab56da42ec0a2fb5db27 (diff) | |
parent | 7fc7f9ce2211e161fc8f009302ded5a78daedd17 (diff) |
Merge "Change factoryReset to succeed for Settings" into qt-dev
am: 7fc7f9ce22
Change-Id: Iaec2ead1a4ba9a947d00d4dd92a303889b16147d
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions