diff options
author | Mark Chien <markchien@google.com> | 2020-10-28 13:33:06 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-28 13:33:06 +0000 |
commit | 2b2e7797d3adb8dd36650a095efd380a3df5a802 (patch) | |
tree | 47d4ab37192f2c78e8c837c6275d8e112cf3ab85 /rs/java/android/renderscript/ProgramStore.java | |
parent | dc3897e910c568391073456896995d59357ae2d7 (diff) | |
parent | 522e0728ef36c5ff90ce4afaa1d23beb4cdc5653 (diff) |
[automerger skipped] Merge "Correct PendingIntent#getActivity() flags" into mainline-prod am: 522e0728ef -s ours
am skip reason: Change-Id I4c3af75c87b797bcde9356a94c835c7422dac1c6 with SHA-1 cb292372fb is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12937915
Change-Id: I48f72b8251dc8c9bb873cb34728e9f7a633a56cb
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions