diff options
| author | Shaotang Li <shaotangli@google.com> | 2018-08-30 18:35:38 +0800 |
|---|---|---|
| committer | Shaotang Li <shaotangli@google.com> | 2018-08-30 10:39:15 +0000 |
| commit | aa68114d8b0ec92477190ef487c0bb631cf13c3b (patch) | |
| tree | f9edf0eb5fc643a5301d798db28402b839fd83ec /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 76dcc6b4707e1fb7c3beb90971009c106c5de68d (diff) | |
| parent | 882f4e1f444194405ef78a3a9d5c1618cb8a8013 (diff) | |
resolve merge conflicts of 882f4e1f444194405ef78a3a9d5c1618cb8a8013 to pi-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: I4d0c3c9420e5c7af697be74521040040284a2299
Merged-In: I2eb6965238e37435bb380fb4a0e616bd1da6dae6
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions