diff options
author | Sal Savage <salsavage@google.com> | 2019-05-24 12:42:52 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-05-24 12:42:52 -0700 |
commit | d8ff56a96d9bd58949b03772430c0af099abadc5 (patch) | |
tree | 8169940a9b2595196fe35d2cd1bb9350be4e23be /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
parent | 55bc95f8d0d4b6f9f5b03553e8ee48b07bb79cc2 (diff) | |
parent | b441d2575a5f42ee129a2b51e07e93c51a6df8af (diff) |
[automerger skipped] Merge "Add timestamp and read status extra constants to MAP Client" am: 9dd24d05e9
am: b441d2575a -s ours
am skip reason: change_id Ic0f04640f1894d6cf336ba7e641df9cf148a2bbd with SHA1 40aa11ead0 is in history
Change-Id: I9045ab97723e5c0a83af2df0729c50dab753f97d
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions