diff options
author | Selim Cinek <cinek@google.com> | 2017-08-04 20:00:05 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-08-04 20:00:05 +0000 |
commit | c9981e4d2503d009bdc01c7fe45879d1a40b21cb (patch) | |
tree | a61a6cee31116b3e69e80cc321e47035dec78829 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 1fe002f6c42694a49d8776c87ce0e59fbf20dfc7 (diff) | |
parent | fb52158e8575602635577c3c2e5fe5159921b3a7 (diff) |
Merge "Fixed that the screen could lock when launching camera" into oc-dr1-dev
am: fb52158e85
Change-Id: I6e2ad8a2805a1206293be50a9dd251c05c35744c
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions