diff options
| author | Eric Laurent <elaurent@google.com> | 2015-10-07 13:56:41 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-10-07 13:56:41 +0000 |
| commit | bbf804ca0dc173c73df300c177aff344c9e4074f (patch) | |
| tree | 608df244866a67c8797fb48d26eaf80cac2c7c76 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 05f88187463119d59955a77c463075e4b12adbc2 (diff) | |
| parent | c6865806a4f76c44bc3cc55cff87cc85f0a48061 (diff) | |
am c6865806: am f5d3f960: am 2a6f1d4a: Merge "ZenModeHelper: fix cross deadlock with AudioService" into mnc-dr-dev
* commit 'c6865806a4f76c44bc3cc55cff87cc85f0a48061':
ZenModeHelper: fix cross deadlock with AudioService
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions