diff options
| author | Daniel Sandler <dsandler@android.com> | 2012-11-08 13:09:05 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-08 13:09:05 -0800 |
| commit | 38883bdd0088277771efca72c80e33773408d72e (patch) | |
| tree | 5ea6e0780bfd44f987b8cb37c1647915107e8ad6 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | f6b6462f277689b7bb6b1f66cb5b57f30d1e194c (diff) | |
| parent | 4eada64770bc2f021cb04cbb77efbad1c9a7adc4 (diff) | |
am 4eada647: Merge "Only show the bouncer for the assistant if secure." into jb-mr1-lockscreen-dev
* commit '4eada64770bc2f021cb04cbb77efbad1c9a7adc4':
Only show the bouncer for the assistant if secure.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions