diff options
author | Lorenzo Colitti <lorenzo@google.com> | 2021-03-11 10:09:42 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-11 10:09:42 +0000 |
commit | c94fb65057a910a1e7a79ae1c9a280c13ef5ee1a (patch) | |
tree | bf20b0cd326ff1d0faaeef646daac528fc6e22bb /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 4ecda9575dfb6c22de3a274979b1ad268cd054a5 (diff) | |
parent | f7bc7a0532189d9fe69aadf94a0fd336018baf9d (diff) |
Merge "Unbreak extraInfo values returned to apps." am: 78cf2f60e5 am: 4fe7f5bf8b am: f7bc7a0532
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1624040
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5e50ac962959387ec42ee644376e1c10df0dc677
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions