diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2013-06-03 17:16:33 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-06-03 17:16:33 -0700 |
| commit | 170c1434b31b171833a8f5605d83ab594a3c15bd (patch) | |
| tree | b727d21f9a641a5820533edbc1cf72b080d83eff /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 90b8994470f233f8bd187e441702d74f5d04644b (diff) | |
| parent | b18841b442006b63a0c57527fdd6d16bc04e6644 (diff) | |
am b18841b4: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit 'b18841b442006b63a0c57527fdd6d16bc04e6644':
Apply scan-always setting to initial wifi state.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions