[automerger skipped] Merge "[DO NOT MERGE] Update quickshare intent rather than recreating" into tm-dev am: 7455a41bd0 -s ours am: 0da99117c8 -s ours am: 681d561a3f -s ours am: c23c1647ee -s ours am: 1f4a4eb04c -s ours am: 336c47cc34 -s ours am: a83886c7ac -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23474146 Change-Id: I240e07db0a38171c7dbca6a971f6790e45dcd2b4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: