summaryrefslogtreecommitdiff
path: root/libs/rs/rsg_ScriptJavaClass.cpp
diff options
context:
space:
mode:
authorPaul Hu <paulhu@google.com>2020-06-23 04:26:59 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-23 04:26:59 +0000
commit78919990f8fa47aa57d92ce6d4d4a03c2a721a26 (patch)
tree22c79eb91c0d40911b363771d02ba57e974e5a51 /libs/rs/rsg_ScriptJavaClass.cpp
parent6775eed106f875bf076805f468d4b816ab4edfa9 (diff)
parentd4f78774fa7222a2e0dfc87b9182d71f15630bb7 (diff)
[automerger skipped] Merge "Make PendingIntent immutable and correct Settings package name" am: 51e93653f6 am: d4f78774fa -s ours
am skip reason: Change-Id I02e3277358623400aa03dc8996af3d7c46a8ce76 with SHA-1 9743233ab1 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1325698 Change-Id: Ib4f8628ead3b0a39a0d1009cb2fd4c0ef5ea246a
Diffstat (limited to 'libs/rs/rsg_ScriptJavaClass.cpp')
0 files changed, 0 insertions, 0 deletions