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