tree d1ff85a4a154deb1ed51c68ba389d03c82dbcd2d
parent 56f9c49ffd5f02f99437e64ab45382c6439cf706
parent b96898a0250152ffdc9fcd6a85b18ff03384a744
author vadimt <vadimt@google.com> 1555098595 -0700
committer android-build-merger <android-build-merger@google.com> 1555098595 -0700

[automerger skipped] Not using Settings app as a source of shortcuts
am: b96898a025 -s ours
am skip reason: SHA1 b96898a025 skipped by user vadimt

Change-Id: I9e1db9877a98b3a45c5304958fcf95c327f2f76c