diff options
| author | Zoltan Szatmary-Ban <szatmz@google.com> | 2015-07-08 11:57:25 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-08 11:57:25 +0000 |
| commit | 706ad39b0a2b8388ab59e4c4cd86dbc65b9cc6cf (patch) | |
| tree | f11fc99033c88f0c9cc260dd23a44dd24cc182e1 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 30871415dca603393b05e7fa2aa9013a3360b03d (diff) | |
| parent | a2de7fc9fc0b96ba4db65ccf6c9684c8c27c2993 (diff) | |
am a2de7fc9: Merge "Prevent accidental unlocking of USB data transfer." into mnc-dev
* commit 'a2de7fc9fc0b96ba4db65ccf6c9684c8c27c2993':
Prevent accidental unlocking of USB data transfer.
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions