diff options
| author | Pavlin Radoslavov <pavlin@google.com> | 2016-06-03 19:15:58 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-03 19:15:58 +0000 |
| commit | 9136f4f6ce11f617ff2047faae7fca23ff275af3 (patch) | |
| tree | db123fc3f028d65464b0d1fdbf59207786dc3aa0 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | bd398d6c27c47b8b6c7278e75aadc932cb26f17c (diff) | |
| parent | 0b78b922dc405d7f77a0ed0e3b5b1a03941b348b (diff) | |
resolve merge conflicts of 9eb77405 to nyc-dev-plus-aosp am: 950abbd075
am: 0b78b922dc
* commit '0b78b922dc405d7f77a0ed0e3b5b1a03941b348b':
While turning OFF do not honor ON requests.
Change-Id: I6839b7f01ebef00a7eb331842bc943617ec11cef
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions