diff options
author | Dianne Hackborn <hackbod@google.com> | 2011-11-29 10:17:42 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-29 10:17:42 -0800 |
commit | e2d76314cdd64cc69c791af0ee2fd2bbcc0425ba (patch) | |
tree | 2b06bea35710fec89c124bb565bbd40d7423c857 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | f4e41c35387728720780935564a491cf9bf1357e (diff) | |
parent | 9b518d9304eb4ad17591944926231b661a3dfce0 (diff) |
am 9b518d93: Merge "Fix issue #5642121: Proximity sensor didn\'t turn the screen on in call" into ics-mr1
* commit '9b518d9304eb4ad17591944926231b661a3dfce0':
Fix issue #5642121: Proximity sensor didn't turn the screen on in call
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions