[automerger skipped] Fix stale NSSL "fling" state caused by no-op fling am: 7f387f9ae9 am: 9166048414 -s ours am: 42df6531c6 -s ours
am skip reason: Merged-In Ie8ddf1dbaaf1ba607657646db05d3eb622fc9415 with SHA-1 7f387f9ae9 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19279469
Change-Id: I4b5b8ed8c9048a342c9382fa81692e9e1a74dbba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: