tree f9731e2b448bc3de85f6bdb2ff61e7dab495d8ae
parent 44e9bc4a1991c40314bb3c2da90d78976ab0801c
parent 04950bbeb68e6a9db4452c949eca64c9bfa61f02
author Robb Glasser <rglasser@google.com> 1533078419 -0700
committer android-build-merger <android-build-merger@google.com> 1533078419 -0700

[automerger skipped] Merge "Adjust launcher opening drag coordinates" into stage-aosp-master am: 4aae6fecfe  -s ours
am: 04950bbeb6  -s ours

Change-Id: Id4ae61ee7f6451c8e3a2c2990f395ffbd9bdbde9