diff options
author | Jeff Sharkey <jsharkey@google.com> | 2021-01-19 17:35:12 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-19 17:35:12 +0000 |
commit | e01117d31dd44435adb7a43c61415e66f0483256 (patch) | |
tree | 7e4b40d7dc8e4e82ec4efd8658dfe124eae0391f /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | c7640aa6d0737fac420c5a18e3a389fc43d815f0 (diff) | |
parent | 8c3a3e3eaf173d8fbda65d587e83ab1dcf7907c0 (diff) |
Merge "Correct ownership of AppSearchPersonTest" am: 8a1d03fe10 am: 03047824e4 am: 8c3a3e3eaf
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552565
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8423abfaaae68bd25d8d716bbb403bb2c5858668
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions