diff options
| author | Amith Yamasani <yamasani@google.com> | 2015-07-24 05:14:36 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-24 05:14:36 +0000 |
| commit | e8e79221bb22b08816aa1a985ed6890d6ccd7212 (patch) | |
| tree | 8317ea6e7ea0c10cfb8f5dcbc619c0e22cab8ba2 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 7ed74ce04040403f7b13f88327cf6801ad8e8505 (diff) | |
| parent | 63af49102373ac575eee2a8c30e2facbb13e1ca5 (diff) | |
am 63af4910: am 81b5d555: am 448af885: am 5a18b4bf: am b3e40760: Merge "Avoid a deadlock between PMS and AppOpsService" into mnc-dev
* commit '63af49102373ac575eee2a8c30e2facbb13e1ca5':
Avoid a deadlock between PMS and AppOpsService
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions