diff options
author | Svetoslav <svetoslavganov@google.com> | 2014-10-01 15:00:44 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-01 15:00:44 +0000 |
commit | 567c97881b1d1719d32daaf647979e47e01be438 (patch) | |
tree | eca7196f5c0adb6941e3425091d4cf41f97da484 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | e353ccbf532139cf4e83969e5fcbc81489fd21a2 (diff) | |
parent | 44d4eeaa48721296663a05d01071f196a509dc34 (diff) |
am 44d4eeaa: Merge "Use default encryption password if an accessibility service is enabled." into lmp-dev
* commit '44d4eeaa48721296663a05d01071f196a509dc34':
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