diff options
| author | Android Build Merger (Role) <android-build-merger@google.com> | 2017-06-23 17:30:45 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-06-23 17:30:57 +0000 |
| commit | 36ddd7d08a715d64937120b183045229c54322b9 (patch) | |
| tree | abc758d572daf80a0578e109c3d9f9d761be1087 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 2053ea450c2fd263ceaed9ef804e1cc9efeadd02 (diff) | |
| parent | 0d148b981e35ea5bcbcadc54ce78f83db67550ed (diff) | |
Merge "Merge "Emergency SUPL when location is disabled" into oc-dev am: 2ffd98670f am: 41bf50cc8b -s ours" into oc-dr1-dev-plus-aosp
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions