diff options
| author | Ajay Panicker <apanicke@google.com> | 2016-09-21 00:48:28 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-09-21 00:48:28 +0000 |
| commit | 2ef2d90eaaaf2c4aea04d4e8cbd5cca20b47bb53 (patch) | |
| tree | fb201c7a3e6afbc95ce1c76a93946622465ea715 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | afafdff50e050a624cfa8d635b6990666a780ee5 (diff) | |
| parent | 1dcec33349b3ebee74c539d24149e7e37cf8b5ee (diff) | |
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev am: 204da8aa9e am: a278a1e660 am: 3d995d6f5f -s ours am: 4f77ca16e4 -s ours am: 959b1aa5b9 am: 7caccc107f
am: 1dcec33349 -s ours
Change-Id: Ibc2d0fd88e89b0553cf5c9542457172692271318
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions