diff options
| author | Winson <winsonc@google.com> | 2016-05-23 18:49:40 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-23 18:49:40 +0000 |
| commit | 7844bb63ab8573b242baa13fe6f7fbfe3ad30460 (patch) | |
| tree | 444b11c5b0adc5a87458eb008dfaeab84e799e05 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | bc27f8fa5767bb163f9bf6b1dc58977a625931fe (diff) | |
| parent | c7a7aa1f17553dfa6ef30934d40215600710ea87 (diff) | |
Merge "Removing extra haptic feedback. am: 7660bca509 am: 60c32b1f15" into nyc-mr1-dev-plus-aosp
am: c7a7aa1f17
* commit 'c7a7aa1f17553dfa6ef30934d40215600710ea87':
Change-Id: I42e28b60ef1d01ce39961ef10c49fd9af6c1a0cd
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions