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