diff options
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2019-09-11 19:56:18 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-09-11 19:56:18 +0000 |
| commit | c1da1ccdb0a383f75a7b5a7b2863f37c5c707ac6 (patch) | |
| tree | f21f6c0f25d3ffe6808999878295f34851a89067 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | fa625301e646f7002be1f633164d333ecdee94be (diff) | |
| parent | 37134016a617b8bbd067ed530226cac61d94d4ce (diff) | |
Merge changes from topic "am-673b70e5db154dbca678dcaa759eb755"
* changes:
[automerger skipped] Merge changes from topic "protobuf-3.9.1" am: 2e928fb62a am: 89ee99a00d am: 1a1c84d6bc am: 88b8d5c8e8 -s ours am skip reason: change_id I0b101555ff604df17b2e3e06f3b3ce25adb1c9fb with SHA1 3f51ab5c82 is in history
[automerger skipped] Adapt to google::protobuf::uint64 type change am: f74defb808 am: 595bfb9b00 am: 6b1de1743e am: 92fb855e8c -s ours am skip reason: change_id Ib2d3f4e17857f8ccbbe342ce6678e76b591df510 with SHA1 d013a88277 is in history
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions