summaryrefslogtreecommitdiff
path: root/libs/rs/rsg_ScriptJavaClass.cpp
diff options
context:
space:
mode:
authorJulia Reynolds <juliacr@google.com>2020-06-03 17:33:14 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-03 17:33:14 +0000
commit36b583ac0603d8f18356b7db2ad8337086b16039 (patch)
tree0f817f865abbf0b6b07c7357ea53aa297ce73b3c /libs/rs/rsg_ScriptJavaClass.cpp
parent21e445f6982ee014dfa4fd2159c757931f518908 (diff)
parent40e37182e43e90a477b40d74da4da04a4db90f96 (diff)
[automerger skipped] Merge "DO NOT MERGE Make intents immutable" into oc-mr1-dev am: b6bf062ea4 -s ours am: 6c5b7271c7 -s ours am: 9e2625148d am: 4c111e6966 -s ours am: fcd539618b am: 130d46dc7a am: 3f4c17a332 am: 40e37182e4 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11630373 Change-Id: Ic4a9874a80df74e659efc9571dfbef85ad70c7ea
Diffstat (limited to 'libs/rs/rsg_ScriptJavaClass.cpp')
0 files changed, 0 insertions, 0 deletions