diff options
| author | Scott Lobdell <slobdell@google.com> | 2019-08-22 05:02:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-08-22 05:02:10 +0000 |
| commit | ee61b816cc15765ab0155bdbdd403f7291dbda30 (patch) | |
| tree | 64f31d40020149c560776c5e508fc12e263f73fe /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | a0fed1a03759d4da168daafbe0f7ae3c7739eab2 (diff) | |
| parent | ee5bba9eeb6c61dee7b74ddd8a6373358c830879 (diff) | |
Merge changes from topic "RP1A.190528.001" into r-keystone-qcom-dev
* changes:
keystone: restore MIN_SUPPORTED_KEEPALIVE_COUNT
Revert "[DO NOT MERGE] Handle config override via settings correctly"
Remove PIXEL_WALLPAPER_CATEGORY_SWITCH from @TestApi's
Revert "[DO NOT MERGE] Fix race in AbstractSinglePendingRequestRemoteService"
Merge RP1A.190528.001
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions