diff options
| author | Beverly Tai <beverlyt@google.com> | 2017-09-12 17:46:18 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-09-12 17:46:18 +0000 |
| commit | 9ac371a81e7d144a8e31f77b085867a92bfd2bd5 (patch) | |
| tree | 45e9e05a30264b937d003dccb80c1759a0b063dd /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 6f76cee0a5788d9833f4d6ac72a945bb85042c1c (diff) | |
| parent | 071443e9332ae8c4d69452a768b59db747eb3fdf (diff) | |
Merge "Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am: 89a94b706d -s ours am: d0d0fea3d6 am: ff058a78ec am: c64209fb6a -s ours am: 5252746fe0 am: b4913b7093 am: 6cd1142360 am: 4bdddadcc5 am: be95e1d91e -s ours am: ff5a0512ec am: 0392ba5f72 am: 517bb6eaa6" into oc-mr1-dev-plus-aosp
am: 071443e933 -s ours
Change-Id: I62ede21d3aeec251d7c702da3ee824d4a8c49e17
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions