diff options
author | Chavi Weingarten <chaviw@google.com> | 2017-08-04 20:40:12 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-08-04 20:40:12 +0000 |
commit | 3477c31485cbcd7b2bad0e2f5f1f55d43dc59a1a (patch) | |
tree | ac38ae6576976881274f587cc118b98fdad128c1 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | ff660190e28ee2476fa0fda3e1a67777f599e9c5 (diff) | |
parent | c36b2f0490dc1d00a5e63f7e5d352a8471108b67 (diff) |
Merge "Only allow one turnScreenOn per app resume." into oc-dr1-dev
am: c36b2f0490
Change-Id: If0b75ee69bdb7c1668e87d40cb0c1d7d72feff58
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions