diff options
author | Jorim Jaggi <jjaggi@google.com> | 2016-12-28 17:21:04 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-12-28 17:21:04 +0000 |
commit | 21635d67f954a5e39c359627fa78ff54d8791132 (patch) | |
tree | 8650925cc334d3af1a52e8c8cb1f6c522ec6fade /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | ef51c27ffe757788aa175deb083bddff5ec81484 (diff) | |
parent | 3b03622406d4498337fdd6b0c6489337feb83016 (diff) |
Merge "Change screen pinning back to old gesture" into nyc-mr2-dev am: 8812fb0695
am: 3b03622406 -s ours
Change-Id: I6dfdf86c11ef17a3cc2d09c7b68486452f5401cc
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions