diff options
author | Adrian Roos <roosa@google.com> | 2017-08-02 21:42:47 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-08-02 21:42:47 +0000 |
commit | 21cd29e235bfa3736dfb4fb4c02d9a9105dc5be4 (patch) | |
tree | 2b9420eceb10679af48b65b071cecd2a9611b503 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 27d9ca08dab518869738af6489ee2fcc8bedb101 (diff) | |
parent | 46f2cdeb63a7d68889c1383b62ef743dddb4cfe6 (diff) |
Merge "WakeAndUnlock: Make sure to wait for screen turning on" into oc-dr1-dev
am: 46f2cdeb63
Change-Id: Ia731476cb31e2a71caf277c29a6ebb34e0ccac90
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions