diff options
| author | Android Build Merger (Role) <android-build-merger@google.com> | 2017-08-09 18:45:31 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-08-09 18:45:31 +0000 |
| commit | 0af0b60db5be8248e622995f94a6b55f21bd39c3 (patch) | |
| tree | a2e8c8f794ed59faacb848930e2e0f6a0ae72239 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 1eaf69c452e89718890b00876d11fb1fae57a725 (diff) | |
| parent | 8f44e20ea637e62fdd83646b9ffdada935a118fa (diff) | |
Merge changes from topic 'am-aaff2463b12d45fc8aad2131d8ac7b9f' into oc-dr1-dev-plus-aosp
* changes:
Catch (and ignore) any timeout exceptions when releasing WakeLock am: 9468b48565 -s ours am: 4542686e42 am: c915b7f703 am: ad8d3240d3
Fix Wakelock underlock in GnssLocationProvider. am: 2ed0166808 -s ours am: 5d60709dc3 am: 17669d31df am: 747bce27e8
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions