diff options
| author | Julia Reynolds <juliacr@google.com> | 2020-06-03 18:28:17 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-03 18:28:17 +0000 |
| commit | b362978f3b00385659cbacdcb8fa1a777ed64c15 (patch) | |
| tree | 0e38b62eec22d7340c60e338d94d35ab2a9d6716 /libs/rs/rsg_ScriptJavaClass.cpp | |
| parent | 602577bb60ca07013efc0202bf2d444da9ef1401 (diff) | |
| parent | 0ede0aa701861e4334beefcc8890532def536222 (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: d4ffc6921b am: 0ede0aa701 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11635218
Change-Id: Idb3654e079792b8286dd152b1fd862f0f818b03b
Diffstat (limited to 'libs/rs/rsg_ScriptJavaClass.cpp')
0 files changed, 0 insertions, 0 deletions