diff options
| author | Svetoslav <svetoslavganov@google.com> | 2014-10-01 15:15:03 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-01 15:15:03 +0000 |
| commit | 344ffbc647926611e52ae31d3e3188099a3b76fc (patch) | |
| tree | a7154f2667305b8ec2f0c5942d33ba9a0fd4c5ca /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | db963b1c5d35d8feb3f6811124ff8a54e3a1ef2c (diff) | |
| parent | 567c97881b1d1719d32daaf647979e47e01be438 (diff) | |
am 567c9788: am 44d4eeaa: Merge "Use default encryption password if an accessibility service is enabled." into lmp-dev
* commit '567c97881b1d1719d32daaf647979e47e01be438':
Use default encryption password if an accessibility service is enabled.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions