diff options
| author | Dianne Hackborn <hackbod@android.com> | 2012-08-14 19:34:14 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-14 19:34:14 -0700 |
| commit | 595b6565dcac3af10983310dff6dcfb88b11f457 (patch) | |
| tree | 6913070f6f6c1a589b8788e39a765a2108a66011 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | abac0cd16105c60fdd6c5ce37116c972dc7431bb (diff) | |
| parent | 977abbb887cfaf7cd8a0d31235281fbdd639ac19 (diff) | |
am 977abbb8: am 48de12c5: Merge "Keep keyguard from starting after finished call when screen is on"
* commit '977abbb887cfaf7cd8a0d31235281fbdd639ac19':
Keep keyguard from starting after finished call when screen is on
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions