diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-10-07 07:13:47 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-07 07:13:47 -0700 |
| commit | cef38339e7d0af61783ad6d35793e2496f5a2b37 (patch) | |
| tree | c0c3376cec0b9ec2b34cd32691a43dff181c0dec /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 4790a2e243dca827921f70647a7aef41e502293e (diff) | |
| parent | 6d44456da87dccb15b4086696f5e72a5aa198926 (diff) | |
am 6d44456d: Merge "Make USB mass storage hide keyguard when shown." into gingerbread
Merge commit '6d44456da87dccb15b4086696f5e72a5aa198926' into gingerbread-plus-aosp
* commit '6d44456da87dccb15b4086696f5e72a5aa198926':
Make USB mass storage hide keyguard when shown.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions