[automerger skipped] Merge "[DO NOT MERGE] Update quickshare intent rather than recreating" into sc-v2-dev am: 65114fddd8 -s ours am: d61976d305 -s ours am: a4432537b1 -s ours am: dcc6a56dc9 -s ours am: 463583aa40 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23516859 Change-Id: Id58d84cabd25ab16398f597868585c9a7b390b15 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: