diff options
| author | Paul Lawrence <paullawrence@google.com> | 2014-12-02 20:30:01 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-02 20:30:01 +0000 |
| commit | ef9b16431e42086bb5729d511abae27ccbde9797 (patch) | |
| tree | 7b6bff6c9bd35dba36bac3f9d673f1396acde1eb /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 4c75415055eb023d4f868a6f22a7f05a1115a8e0 (diff) | |
| parent | 1056d5a997e3f30230e1e4316310586dd15a4600 (diff) | |
am 1056d5a9: am 75f304f9: Merge changes Ibfb5c6ab,I712919ae into lmp-mr1-dev
* commit '1056d5a997e3f30230e1e4316310586dd15a4600':
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