diff options
| author | Zoltan Szatmary-Ban <szatmz@google.com> | 2015-07-08 12:55:25 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-08 12:55:25 +0000 |
| commit | 032ba9f3d1a9edc85ac2e3595f5cedb6d5b27103 (patch) | |
| tree | d1714c8961faa53f368fa3b8fe4dcb514eadcd9d /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 55a3a23307ba1591b95941f7c487c931da505ce0 (diff) | |
| parent | 2fbfe42955520c6831fd5df94d87ada875f9299b (diff) | |
am 2fbfe429: am 92c1d283: am 706ad39b: am a2de7fc9: Merge "Prevent accidental unlocking of USB data transfer." into mnc-dev
* commit '2fbfe42955520c6831fd5df94d87ada875f9299b':
Prevent accidental unlocking of USB data transfer.
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions