diff options
author | Lucas Dupin <dupin@google.com> | 2019-06-24 08:13:24 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-06-24 08:13:24 -0700 |
commit | e8dec1fb96d295da6f4ba12a6a96a7777e96b2bc (patch) | |
tree | 360ed98dee5247f4a6f3f02bcaa254d5ee5cff44 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
parent | 1f87082fdd6fc6a73c8e0008360af09df2d01c7e (diff) | |
parent | d749a781201c9debb143c059012a44bf06d73d8e (diff) |
[automerger skipped] Merge "Unregister listeners and reset wake lock" into qt-dev am: 9b47581ea4 -s ours
am: d749a78120 -s ours
am skip reason: change_id I227842d7272d1edeaa67d776950f369aedb01a91 with SHA1 2bc992decb is in history
Change-Id: I1bc34cb9169b5daf417d827ea68fc61ca2464a77
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions