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