diff options
| author | Xiao Ma <xiaom@google.com> | 2019-04-23 02:28:06 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-04-23 02:28:06 -0700 |
| commit | 9f7760dd21278cefd945c0cf8a416149ed24ebb9 (patch) | |
| tree | c82dc76e52569450f37c31da79b3fc6b90eb916c /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 31b7cbd9e6f57942a6fa83837a26b89228bc11fe (diff) | |
| parent | 27ad19ee9e9c3719b84263823217d53a33f50858 (diff) | |
[automerger skipped] Merge "provide a resource overlay to configure customized DNS Server." into qt-dev
am: 27ad19ee9e -s ours
am skip reason: change_id I123b3d4516cc6ba6d17629eb74daf448ba7121eb with SHA1 a4d0122048 is in history
Change-Id: Ia4a68691a8f7113c9575b4856a47f9c011a21653
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions