tree f038fdb5039c41eebac1bbc59c7a7c8697bc1904
parent 34ca0d3c624fa3cb5004252f92a98a6ec0802afd
parent b548b3c7b06dbf9c2bd6c47c5fbdbd844f06ae8a
author Jon Miranda <jonmiranda@google.com> 1568680664 -0700
committer android-build-merger <android-build-merger@google.com> 1568680664 -0700

[automerger skipped] [DO NOT MERGE] resolve merge conflicts of cfdeb0620579127e2b0bba74b616b281434ffca7 to ub-launcher3-qt-future-dev
am: b548b3c7b0 -s ours
am skip reason: subject contains skip directive

Change-Id: I6192de456ac25e50c6ba638279d5722685cbf04d