diff options
| author | Bill Yi <byi@google.com> | 2019-08-06 23:59:16 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-08-06 23:59:16 -0700 |
| commit | 98dea393aed5f8f5e27d475011ffa9c232e9fa50 (patch) | |
| tree | 55e8ed088b051dfd58d709b0fdccc8f560248a58 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | e0609367867020f2a7d5091ce9c778ee3205c352 (diff) | |
| parent | bd67e02e5f38bfe16549d3a95e2531c3584b727d (diff) | |
Merge "Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 6aa3f38983 -s ours am: 21fd281430 -s ours am: 515271697b -s ours
am: bd67e02e5f -s ours
am skip reason: subject contains skip directive
Change-Id: Ibff6846a5e4ff19cbd9fa049e34496eb399aaaf2
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions