diff options
author | Yuanlang Song <yuanlang@google.com> | 2016-12-06 20:30:16 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-12-06 20:30:16 +0000 |
commit | 5f6dc40aa96a1c75dd18d40815f227027b84252b (patch) | |
tree | 7338012f79f3ad498c9279ea9287c2eb809cd70f /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 53204d25517916ea0bddab6c2727324d2ab51ae7 (diff) | |
parent | f00afab1deb212e7defba7d57e83968cf7fe9d51 (diff) |
Merge "Merge "DO NOT MERGE: Add TouchLatency test" into cw-f-dev am: 647166e852 am: a49aa940be" into nyc-mr2-dev-plus-aosp
am: f00afab1de -s ours
Change-Id: I6de602f69d43e635f6925a9eeac78d06b8d03592
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions