diff options
| author | Paul Lawrence <paullawrence@google.com> | 2014-12-02 20:22:18 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-02 20:22:18 +0000 |
| commit | 1056d5a997e3f30230e1e4316310586dd15a4600 (patch) | |
| tree | d6f038ea117e18a4b1b2a1ed17d02726b6dd3042 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 0e8c773775bf6d2ae9986a64b8aece332992c6d4 (diff) | |
| parent | 75f304f922dcb27e57dcbea17a36d426f6b223a7 (diff) | |
am 75f304f9: Merge changes Ibfb5c6ab,I712919ae into lmp-mr1-dev
* commit '75f304f922dcb27e57dcbea17a36d426f6b223a7':
Add mechanism for securely returning parameters though NativeDaemonConnector
Revert "DO NOT MERGE: Don't log passwords returned from vdc"
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions