diff options
| author | Wayne Ma <waynema@google.com> | 2019-04-24 13:14:17 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-04-24 13:14:17 -0700 |
| commit | 7866c679c8f7841e288f92a116a434f13b473c2f (patch) | |
| tree | 51bbd3dd3b981b7b2d5400b1bc7707f1250dec92 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 0db8585736958788be7e1f3814822ee2e7990beb (diff) | |
| parent | e9635d80f190519289fa39a27e1a7a4c085ca7cf (diff) | |
[automerger skipped] Merge "Backwards-incompatible resolv module API change for making setResolverConfiguration take a parcelable." into qt-dev
am: e9635d80f1 -s ours
am skip reason: change_id I6dc9029af0df0d3b391210bd315516bdf1b5e4c9 with SHA1 23752d475a is in history
Change-Id: Ie9bfef68a5c78272d4c7b31e9427ba2f5c57d056
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions