summaryrefslogtreecommitdiff
path: root/libs/rs/rsg_ScriptJavaClass.cpp
diff options
context:
space:
mode:
authorJulia Reynolds <juliacr@google.com>2020-06-03 18:17:17 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-03 18:17:17 +0000
commit7a29fec43aa287bb58f066bde52705aceb00caba (patch)
treebd2675bfbeed4e547e23915b0831f537d8b6d17c /libs/rs/rsg_ScriptJavaClass.cpp
parent243f1a587879beea8f94e4c6103824d8c358372a (diff)
parentf2102b3ba16c9f254173df66d72da7e523a7dc42 (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: 6d81ec0c0e am: 2bc4646290 am: f2102b3ba1 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11635218 Change-Id: I6844faa0363b120c82ab28ac98814e8321e00305
Diffstat (limited to 'libs/rs/rsg_ScriptJavaClass.cpp')
0 files changed, 0 insertions, 0 deletions