diff options
| author | Paul Hu <paulhu@google.com> | 2020-06-29 12:41:49 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-29 12:41:49 +0000 |
| commit | b4226fe3e54c140961984a4f732bd674cd62fb2d (patch) | |
| tree | 774d9d98e814d4de347da771cc053dc7761d5876 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | a523acbda48c60e081b7bbbd60e8ed30d8575bcc (diff) | |
| parent | d7638aecc21abdc2327418bbc987c95e91367727 (diff) | |
Merge "Correct PendingIntent#getActivity() flags" am: 2063bec5c2 am: 71eee20732 am: 429126464c am: d7638aecc2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1329013
Change-Id: Ic957a19c9e6e82acf06072382c2c0e65629ff537
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions