summaryrefslogtreecommitdiff
path: root/libs/rs/rsg_ScriptJavaClass.cpp
diff options
context:
space:
mode:
authorJulia Reynolds <juliacr@google.com>2020-06-03 18:33:05 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-03 18:33:05 +0000
commit55974a8f313e7e212064e701b53f5699706dd5fc (patch)
tree2ba4e472ccef829567d5d76b698ce6b166754b74 /libs/rs/rsg_ScriptJavaClass.cpp
parent5ce735f0adfa563d49cd41b6f35f1e99a2c12892 (diff)
parentaa1e3129c83a2767865e316540ddbc3f631bcfd7 (diff)
[automerger skipped] Merge "DO NOT MERGE Make intents immutable" into oc-dev am: 1e8240d82f am: 53f1a99fa0 am: 18b5a53447 -s ours am: 0b212d65e1 -s ours am: a9f6ccf964 am: dae7a3468c -s ours am: 6a2eb025f4 am: 1daf6dd2ed am: d3110f412e am: aa1e3129c8 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11635218 Change-Id: Ia6a818eac8aaaed31045aeca978786f16791b66b
Diffstat (limited to 'libs/rs/rsg_ScriptJavaClass.cpp')
0 files changed, 0 insertions, 0 deletions