diff options
| author | Amith Yamasani <yamasani@google.com> | 2015-07-24 03:08:30 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-24 03:08:30 +0000 |
| commit | 448af8855e304da3bd62dc50cc2d843dc51ce7de (patch) | |
| tree | 287c709fc7de48624f4c7355c21dea20ed6ce92e /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | bb3202995a274e25d04a69e8dcd5ac8e07b9faa1 (diff) | |
| parent | 5a18b4bfe2cf30df2e18047c155fecc6433ed52c (diff) | |
am 5a18b4bf: am b3e40760: Merge "Avoid a deadlock between PMS and AppOpsService" into mnc-dev
* commit '5a18b4bfe2cf30df2e18047c155fecc6433ed52c':
Avoid a deadlock between PMS and AppOpsService
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions